diff options
| author | James Turnbull <james@lovedthanlost.net> | 2010-03-31 12:39:54 +1100 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 385506ff6209df909dc1f39f00a700274c530755 (patch) | |
| tree | 20b77155e47935f88d44c47cc11d648bef0de352 /conf | |
| parent | b494427ff76ec8ec90d6d389b32a7c9fe9b7f20d (diff) | |
| download | puppet-385506ff6209df909dc1f39f00a700274c530755.tar.gz puppet-385506ff6209df909dc1f39f00a700274c530755.tar.xz puppet-385506ff6209df909dc1f39f00a700274c530755.zip | |
Fixes #3460 - Makes Puppet FHS compliant by moving /var/puppet to /var/lib/puppet
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/gentoo/puppet/puppet.conf | 4 | ||||
| -rw-r--r-- | conf/redhat/puppet.conf | 4 | ||||
| -rwxr-xr-x | conf/solaris/smf/svc-puppetd | 2 | ||||
| -rwxr-xr-x | conf/solaris/smf/svc-puppetmasterd | 2 | ||||
| -rw-r--r-- | conf/suse/puppet.spec | 2 |
5 files changed, 3 insertions, 11 deletions
diff --git a/conf/gentoo/puppet/puppet.conf b/conf/gentoo/puppet/puppet.conf index 70dcb02da..d35593f12 100644 --- a/conf/gentoo/puppet/puppet.conf +++ b/conf/gentoo/puppet/puppet.conf @@ -1,8 +1,4 @@ [main] - # Where Puppet stores dynamic and growing data. - # The default value is '/var/puppet'. - vardir = /var/lib/puppet - # The Puppet log directory. # The default value is '$vardir/log'. logdir = /var/log/puppet diff --git a/conf/redhat/puppet.conf b/conf/redhat/puppet.conf index 70dcb02da..d35593f12 100644 --- a/conf/redhat/puppet.conf +++ b/conf/redhat/puppet.conf @@ -1,8 +1,4 @@ [main] - # Where Puppet stores dynamic and growing data. - # The default value is '/var/puppet'. - vardir = /var/lib/puppet - # The Puppet log directory. # The default value is '$vardir/log'. logdir = /var/log/puppet diff --git a/conf/solaris/smf/svc-puppetd b/conf/solaris/smf/svc-puppetd index 251b044a5..9036b505c 100755 --- a/conf/solaris/smf/svc-puppetd +++ b/conf/solaris/smf/svc-puppetd @@ -12,7 +12,7 @@ exec_prefix=/opt/csw sysconfdir=/opt/csw/etc sbindir=/opt/csw/sbin -pidfile=/var/puppet/run/puppetd.pid +pidfile=/var/lib/puppet/run/puppetd.pid case "$1" in start) diff --git a/conf/solaris/smf/svc-puppetmasterd b/conf/solaris/smf/svc-puppetmasterd index 684344b38..34f5a62e6 100755 --- a/conf/solaris/smf/svc-puppetmasterd +++ b/conf/solaris/smf/svc-puppetmasterd @@ -8,7 +8,7 @@ exec_prefix=/opt/csw sysconfdir=/opt/csw/etc sbindir=/opt/csw/sbin -pidfile=/var/puppet/run/puppetmasterd.pid +pidfile=/var/lib/puppet/run/puppetmasterd.pid case "$1" in start) diff --git a/conf/suse/puppet.spec b/conf/suse/puppet.spec index 9d317f849..1d08f3df7 100644 --- a/conf/suse/puppet.spec +++ b/conf/suse/puppet.spec @@ -99,7 +99,7 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -print0 | xargs -0 -r % %pre /usr/sbin/groupadd -r puppet 2>/dev/null || : /usr/sbin/useradd -g puppet -c "Puppet" \ - -s /sbin/nologin -r -d /var/puppet puppet 2> /dev/null || : + -s /sbin/nologin -r -d /var/lib/puppet puppet 2> /dev/null || : %post /sbin/chkconfig --add puppet |