diff options
| -rw-r--r-- | conf/freebsd/puppetd | 2 | ||||
| -rw-r--r-- | conf/freebsd/puppetmasterd | 2 | ||||
| -rw-r--r-- | conf/suse/puppet.spec | 18 | ||||
| -rw-r--r-- | man/man8/puppet.8 | 9 |
4 files changed, 16 insertions, 15 deletions
diff --git a/conf/freebsd/puppetd b/conf/freebsd/puppetd index bf718a027..4a5ae59ca 100644 --- a/conf/freebsd/puppetd +++ b/conf/freebsd/puppetd @@ -18,7 +18,7 @@ pidfile="/var/run/$name.pid" # read configuration and set defaults load_rc_config "$name" : ${puppetd_enable="NO"} -: ${puppetd_config="/usr/local/etc/puppetd.conf"} +: ${puppetd_config="/usr/local/etc/puppet.conf"} : ${puppetd_flags=""} command_args="--config $puppetd_config $puppetd_flags" diff --git a/conf/freebsd/puppetmasterd b/conf/freebsd/puppetmasterd index 6f217dc8c..d41e0031b 100644 --- a/conf/freebsd/puppetmasterd +++ b/conf/freebsd/puppetmasterd @@ -18,7 +18,7 @@ pidfile="/var/run/$name.pid" # read configuration and set defaults load_rc_config "$name" : ${puppetmasterd_enable="NO"} -: ${puppetmasterd_config="/usr/local/etc/puppetmasterd.conf"} +: ${puppetmasterd_config="/usr/local/etc/puppet.conf"} : ${puppetmasterd_flags=""} command_args="--config $puppetmasterd_config $puppetmasterd_flags" diff --git a/conf/suse/puppet.spec b/conf/suse/puppet.spec index 6d4e9f538..f1fa0ba2d 100644 --- a/conf/suse/puppet.spec +++ b/conf/suse/puppet.spec @@ -5,7 +5,7 @@ Summary: A network tool for managing many disparate systems Name: puppet -Version: 0.18.4 +Version: 0.24.1 Release: 3%{?dist} License: GPL Group: System Environment/Base @@ -15,11 +15,11 @@ Source: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz Patch0: puppet.suse.patch Patch1: puppet.service.patch -Requires: ruby >= 1.8.1 -Requires: facter >= 1.1.4 +Requires: ruby >= 1.8.6 +Requires: facter >= 1.3.7 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArchitectures: noarch -BuildRequires: ruby >= 1.8.1 +BuildRequires: ruby >= 1.8.6 %description Puppet lets you centrally manage every important aspect of your system using a @@ -67,9 +67,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 %{suseconfdir}/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}/puppet.conf %{buildroot}%{_sysconfdir}/puppet/puppet.conf %{__install} -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/puppet %files @@ -79,7 +77,7 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r % %{ruby_sitelibdir}/* %{_initrddir}/puppet %config(noreplace) %{_sysconfdir}/sysconfig/puppet -%config(noreplace) %{_sysconfdir}/puppet/puppetd.conf +%config(noreplace) %{_sysconfdir}/puppet/puppet.conf %doc CHANGELOG COPYING LICENSE README TODO examples %exclude %{_sbindir}/puppetdoc %config(noreplace) %{_sysconfdir}/logrotate.d/puppet @@ -131,6 +129,10 @@ fi %{__rm} -rf %{buildroot} %changelog +* Sat Feb 16 2008 James Turnbull <james@lovedthanlost.net> - 0.24.1-1 +- Fixed puppet configuation file references to match single puppet.conf file +- Update versions for 0.24.1 release + * Tue Aug 3 2006 Martin Vuk <martin.vuk@fri.uni-lj.si> - 0.18.4-3 - Replaced puppet-bin.patch with %build section from David's spec diff --git a/man/man8/puppet.8 b/man/man8/puppet.8 index 2fd2ab102..53e527070 100644 --- a/man/man8/puppet.8 +++ b/man/man8/puppet.8 @@ -44,10 +44,9 @@ Note that boolean options are turned on and off with a slightly different syntax .PP The invocations above will enable and disable, respectively, the storage of the client configuration. .PP -As mentioned above, the configuration parameters can also be stored in a configuration file located in the configuration directory (/etc/puppet by default). The file is named for the executable it is intended for, for example /etc/puppetd.conf is the configuration file for -.B puppetd. +As mentioned above, the configuration parameters can also be stored in a configuration file located in the configuration directory (/etc/puppet by default). The file is called puppet.conf. .PP -The file, which follows INI-style formatting, should contain a bracketed heading named for the executable, followed by pairs of parameters with their values. Here is an example of a very simple puppetd.conf file: +The file, which follows INI-style formatting, should contain a bracketed heading named for each executable, followed by pairs of parameters with their values. Here is an example of a very simple puppet.conf file: .PP \h"4"[puppetd] .br @@ -60,9 +59,9 @@ Note that boolean parameters must be explicitly specified as true or false as se .PP If you're starting out with a fresh configuration, you may wish to let the executable generate a template configuration file for you by invoking the executable in question with the --genconfig command. The executable will print a template configuration to standard output, which can be redirected to a file like so: .PP -\h"4"$ puppetd --genconfig > /etc/puppet/puppetd.conf +\h"4"$ puppetd --genconfig > /etc/puppet/puppet.conf .PP -Note that this invocation will "clobber" (throw away) the contents of any pre-existing puppetd.conf file, so make a backup of your present config if it contains valuable information. +Note that this invocation will "clobber" (throw away) the contents of any pre-existing puppet.conf file, so make a backup of your present config if it contains valuable information. .PP Like the --genconfig argument, the executables also accept a --genmanifest argument, which will generate a manifest that can be used to manage all of .B Puppet's |