diff options
| author | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-06-21 17:39:34 +0000 |
|---|---|---|
| committer | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-06-21 17:39:34 +0000 |
| commit | dc2a0bff1447be715f8ca749a6140edb224a459a (patch) | |
| tree | 1a9cd6eda94a0800a378f826546005314411c4e8 | |
| parent | 3aafa84493dbc1f3764526a16fb1fdac6e1671e9 (diff) | |
| download | puppet-dc2a0bff1447be715f8ca749a6140edb224a459a.tar.gz puppet-dc2a0bff1447be715f8ca749a6140edb224a459a.tar.xz puppet-dc2a0bff1447be715f8ca749a6140edb224a459a.zip | |
Use single config file
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2639 980ebf18-57e1-0310-9a29-db15c13687c0
| -rw-r--r-- | conf/redhat/puppet.spec | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec index b4d1ef084..f9504c412 100644 --- a/conf/redhat/puppet.spec +++ b/conf/redhat/puppet.spec @@ -72,9 +72,7 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r % %{__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/puppetd.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/puppet.conf %{__install} -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet %files @@ -87,8 +85,8 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r % %{_initrddir}/puppet %dir %{_sysconfdir}/puppet %config(noreplace) %{_sysconfdir}/sysconfig/puppet -%config(noreplace) %{_sysconfdir}/puppet/puppetd.conf -%doc CHANGELOG COPYING LICENSE README TODO examples +%config(noreplace) %{_sysconfdir}/puppet/puppet.conf +%doc CHANGELOG COPYING LICENSE README examples %exclude %{_sbindir}/puppetdoc %config(noreplace) %{_sysconfdir}/logrotate.d/puppet # These need to be owned by puppet so the server can @@ -141,6 +139,9 @@ fi %{__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 + * Wed May 2 2007 David Lutterkort <dlutter@redhat.com> - 0.22.4-1 - New version |