Skip to content

Commit c2f4b36

Browse files
authored
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 <rohit.yadav@shapeblue.com>
1 parent 6f1c555 commit c2f4b36

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

packaging/centos63/cloud.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
574574
%attr(0755,root,root) %{_bindir}/%{name}-ssh
575575
%attr(0755,root,root) %{_sysconfdir}/init.d/%{name}-agent
576576
%attr(0644,root,root) %{_sysconfdir}/profile.d/%{name}-agent-profile.sh
577-
%attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}-agent
577+
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-agent
578578
%attr(0755,root,root) %{_datadir}/%{name}-common/scripts/network/cisco
579579
%config(noreplace) %{_sysconfdir}/%{name}/agent
580580
%dir %{_localstatedir}/log/%{name}/agent

packaging/centos7/cloud.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
521521
%attr(0644,root,root) %{_unitdir}/%{name}-agent.service
522522
%config(noreplace) %{_sysconfdir}/default/%{name}-agent
523523
%attr(0644,root,root) %{_sysconfdir}/profile.d/%{name}-agent-profile.sh
524-
%attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}-agent
524+
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-agent
525525
%attr(0755,root,root) %{_datadir}/%{name}-common/scripts/network/cisco
526526
%config(noreplace) %{_sysconfdir}/%{name}/agent
527527
%dir %{_localstatedir}/log/%{name}/agent

0 commit comments

Comments
 (0)