(puppetlabs/puppet-dashboard) (#12440) Add config flag to puppet-dashboard file in rh spec

3 views
Skip to first unread message

weareth...@puppetlabs.com

unread,
Feb 10, 2012, 4:45:34 PM2/10/12
to puppe...@googlegroups.com

Please review pull request #84: (#12440) Add config flag to puppet-dashboard file in rh spec opened by (MosesMendoza)

Description:

Without this commit, the installer for dashboard treats the
/etc/sysconfig/puppet-dashboard config file as a regular file
and overwrites it during install, even if it already exists
and has been modified. This patch marks puppet-dashboard in
the spec file as a config file, so that if it exists on the
install target and is modified, the original version is preserved.

  • Opened: Fri Feb 10 21:32:04 UTC 2012
  • Based on: puppetlabs:master (6dae29eb72a5d1b6ecfa3f5e49109040fbf4f02f)
  • Requested merge: MosesMendoza:Ticket/master/12440_mark_config_in_spec_file (346be633d8f969a7b8c691a3ad14667e3f0edb59)

Diff follows:

diff --git a/ext/packaging/redhat/puppet-dashboard.spec.erb b/ext/packaging/redhat/puppet-dashboard.spec.erb
index 5bcb2df..665f14e 100644
--- a/ext/packaging/redhat/puppet-dashboard.spec.erb
+++ b/ext/packaging/redhat/puppet-dashboard.spec.erb
@@ -113,7 +113,7 @@ fi
 %attr(-,puppet-dashboard,puppet-dashboard) %config(noreplace) %{_datadir}/%{name}/config/*
 %{initrddir}/puppet-dashboard
 %{initrddir}/puppet-dashboard-workers
-%{_sysconfdir}/sysconfig/puppet-dashboard
+%config(noreplace) %{_sysconfdir}/sysconfig/puppet-dashboard
 %{_sysconfdir}/logrotate.d/puppet-dashboard
 %attr(-,puppet-dashboard,puppet-dashboard) %doc %{_datadir}/puppet-dashboard/VERSION
 %attr(-,puppet-dashboard,puppet-dashboard) %{_datadir}/puppet-dashboard/Rakefile

    

Reply all
Reply to author
Forward
0 new messages