[prev in list] [next in list] [prev in thread] [next in thread] 

List:       puppet-commit
Subject:    [Puppet-commit] puppet revision 2639
From:       svn () madstop ! com
Date:       2007-06-21 17:39:35
Message-ID: 20070621173935.0B008160060 () puppet ! reductivelabs ! com
[Download RAW message or body]

lutter 2007-06-21 19:39:34 +0200 (Thu, 21 Jun 2007)
Use single config file
Modified: trunk/conf/redhat/puppet.spec
===================================================================
--- trunk/conf/redhat/puppet.spec	2007-06-21 15:10:37 UTC (rev 2638)
+++ trunk/conf/redhat/puppet.spec	2007-06-21 17:39:34 UTC (rev 2639)
@@ -72,9 +72,7 @@
 %{__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 @@
 %{_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 @@
 %{__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
 


[Attachment #3 (text/html)]

<p><b>lutter</b> 2007-06-21 19:39:34 +0200 (Thu, 21 Jun 2007)</p><p>Use single config file<br>
</p><hr noshade><pre><font color="gray">Modified: trunk/conf/redhat/puppet.spec
===================================================================
--- trunk/conf/redhat/puppet.spec	2007-06-21 15:10:37 UTC (rev 2638)
+++ trunk/conf/redhat/puppet.spec	2007-06-21 17:39:34 UTC (rev 2639)
@@ -72,9 +72,7 @@
 %{__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 @@
 %{_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 @@
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Wed Jun 20 2007 David Lutterkort &lt;dlutter@redhat.com&gt; - 0.23.0-1
+- Install one puppet.conf instead of old config files
+
 * Wed May  2 2007 David Lutterkort &lt;dlutter@redhat.com&gt; - 0.22.4-1
 - New version
 

</font>
</pre>


[prev in list] [next in list] [prev in thread] [next in thread]