From 5611fc4c59a449c6c27a8ee8e4834cdbe67f8a44 Mon Sep 17 00:00:00 2001 From: rabbitali Date: Wed, 5 Jun 2024 19:46:31 +0800 Subject: [PATCH] update register template file --- 0006-update-register-template-file.patch | 25 ++++++++++++++++++++++++ aops-ceres.spec | 6 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0006-update-register-template-file.patch diff --git a/0006-update-register-template-file.patch b/0006-update-register-template-file.patch new file mode 100644 index 0000000..232fa17 --- /dev/null +++ b/0006-update-register-template-file.patch @@ -0,0 +1,25 @@ +From f6cc88528868c646292f7b4d238e848b70d9246a Mon Sep 17 00:00:00 2001 +From: rabbitali +Date: Wed, 5 Jun 2024 19:30:03 +0800 +Subject: [PATCH 1/1] update register template file + +--- + conf/register_example.json | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/conf/register_example.json b/conf/register_example.json +index 4fcd642..60bcbc4 100644 +--- a/conf/register_example.json ++++ b/conf/register_example.json +@@ -7,5 +7,6 @@ + "host_group_name": "aops", + "management": false, + "ssh_port":22, +- "access_token": "token-string" ++ "access_token": "token-string", ++ "ssh_pkey":"" + } +\ No newline at end of file +-- +2.33.0 + diff --git a/aops-ceres.spec b/aops-ceres.spec index 01203ea..687f7be 100644 --- a/aops-ceres.spec +++ b/aops-ceres.spec @@ -2,7 +2,7 @@ Name: aops-ceres Version: v1.4.1 -Release: 6 +Release: 7 Summary: An agent which needs to be adopted in client, it managers some plugins, such as gala-gopher(kpi collection), fluentd(log collection) and so on. License: MulanPSL2 URL: https://gitee.com/openeuler/%{name} @@ -18,6 +18,7 @@ Patch0002: 0002-support-restore-grubby-if-kabi-check-failed.patch Patch0003: 0003-remove-installed-rpm-if-unreboot-and-improve-log-for-rollback.patch Patch0004: 0004-fix-cve-2021-33633.patch Patch0005: 0005-override-list-file-method.patch +Patch0006: 0006-update-register-template-file.patch %description @@ -91,6 +92,9 @@ install -b -m500 ./extra-tools/da-tool/script/da-tool.sh ${RPM_BUILD_ROOT} %attr(0500, root, root) %{_bindir}/da-tool-analysis %changelog +* Wed Jun 05 2024 wenxin - v1.4.1-7 +- update register template file + * Wed Feb 07 2024 wenxin - v1.4.1-6 - override list file method