diff options
| author | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-06-21 21:32:32 +0000 |
|---|---|---|
| committer | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-06-21 21:32:32 +0000 |
| commit | 6b7d3aa037a995a18a598c1e83e150332bb32e1b (patch) | |
| tree | a2336e0f9be1825dce83e12103e3597a6a21f9b7 | |
| parent | ac36ddd90220dcec5d3f9d9f0c29cd59c9898420 (diff) | |
| download | puppet-6b7d3aa037a995a18a598c1e83e150332bb32e1b.tar.gz puppet-6b7d3aa037a995a18a598c1e83e150332bb32e1b.tar.xz puppet-6b7d3aa037a995a18a598c1e83e150332bb32e1b.zip | |
Create the right puppet.conf; make sure old config files get preserved and stay functional
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2643 980ebf18-57e1-0310-9a29-db15c13687c0
| -rw-r--r-- | conf/redhat/puppet.spec | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec index 13a25fbec..ec473d2f5 100644 --- a/conf/redhat/puppet.spec +++ b/conf/redhat/puppet.spec @@ -43,6 +43,8 @@ The server can also function as a certificate authority and file server. %prep %setup -q +cp -p conf/redhat/puppetd.conf conf/redhat/puppet.conf +sed -i -e 's/^\[puppet\]$/[main]/' conf/redhat/puppet.conf %build for f in bin/* ; do @@ -72,7 +74,10 @@ install -Dp -m0755 %{confdir}/client.init %{buildroot}%{_initrddir}/puppet install -Dp -m0644 %{confdir}/server.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/puppetmaster install -Dp -m0755 %{confdir}/server.init %{buildroot}%{_initrddir}/puppetmaster install -Dp -m0644 %{confdir}/fileserver.conf %{buildroot}%{_sysconfdir}/puppet/fileserver.conf -install -Dp -m0644 %{confdir}/puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf +install -Dp -m0644 %{confdir}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf +ln -s puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetmasterd.conf +ln -s puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetca.conf +install -Dp -m0644 %{confdir}/puppetd.conf %{buildroot}%{_sysconfdir}/puppet/puppetd.conf install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet %files @@ -86,6 +91,7 @@ install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/p %dir %{_sysconfdir}/puppet %config(noreplace) %{_sysconfdir}/sysconfig/puppet %config(noreplace) %{_sysconfdir}/puppet/puppet.conf +%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetd.conf %doc CHANGELOG COPYING LICENSE README examples %exclude %{_sbindir}/puppetdoc %config(noreplace) %{_sysconfdir}/logrotate.d/puppet @@ -100,8 +106,11 @@ install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/p %{_sbindir}/puppetmasterd %{_bindir}/puppetrun %{_initrddir}/puppetmaster -%config(noreplace) %{_sysconfdir}/puppet/* +%config(noreplace) %{_sysconfdir}/puppet/fileserver.conf +%dir %{_sysconfdir}/puppet/manifests %config(noreplace) %{_sysconfdir}/sysconfig/puppetmaster +%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetca.conf +%ghost %config(noreplace,missingok) %{_sysconfdir}/puppet/puppetmasterd.conf %{_sbindir}/puppetca %pre @@ -140,7 +149,8 @@ rm -rf %{buildroot} %changelog * Wed Jun 20 2007 David Lutterkort <dlutter@redhat.com> - 0.23.0-1 -- Install one puppet.conf instead of old config files +- Install one puppet.conf instead of old config files, keep old configs + around to ease update - Use plain shell commands in install instead of macros * Wed May 2 2007 David Lutterkort <dlutter@redhat.com> - 0.22.4-1 |