From c2f4b3653d4b6a256e75b3aa57cc1db9f97154aa Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 25 Sep 2018 11:25:06 -0400 Subject: [PATCH] packaging: Fixes #2857 don't overwrite agent logrotate config (#2860) This makes the agent logrotate config to `noreplace` so on upgrade any changes to the file are not lost. Signed-off-by: Rohit Yadav --- packaging/centos63/cloud.spec | 2 +- packaging/centos7/cloud.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 68e2c56f5bf..0d99ec3367a 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -574,7 +574,7 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz %attr(0755,root,root) %{_bindir}/%{name}-ssh %attr(0755,root,root) %{_sysconfdir}/init.d/%{name}-agent %attr(0644,root,root) %{_sysconfdir}/profile.d/%{name}-agent-profile.sh -%attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}-agent +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-agent %attr(0755,root,root) %{_datadir}/%{name}-common/scripts/network/cisco %config(noreplace) %{_sysconfdir}/%{name}/agent %dir %{_localstatedir}/log/%{name}/agent diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index a4f4dcc1b4c..c29d18b56cd 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -521,7 +521,7 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz %attr(0644,root,root) %{_unitdir}/%{name}-agent.service %config(noreplace) %{_sysconfdir}/default/%{name}-agent %attr(0644,root,root) %{_sysconfdir}/profile.d/%{name}-agent-profile.sh -%attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}-agent +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-agent %attr(0755,root,root) %{_datadir}/%{name}-common/scripts/network/cisco %config(noreplace) %{_sysconfdir}/%{name}/agent %dir %{_localstatedir}/log/%{name}/agent