summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0>2007-03-19 22:31:23 +0000
committerlutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0>2007-03-19 22:31:23 +0000
commita68a7c285dbb8524acbf7f2cf1da3b915116f0e3 (patch)
treee09ba87cc42a3fd86d20316ee99b28c054b071e5
parent145c39c79dfb6f235579f93ff85c54930d00920f (diff)
downloadpuppet-a68a7c285dbb8524acbf7f2cf1da3b915116f0e3.tar.gz
puppet-a68a7c285dbb8524acbf7f2cf1da3b915116f0e3.tar.xz
puppet-a68a7c285dbb8524acbf7f2cf1da3b915116f0e3.zip
Change puppet's homedir to /var/lib/puppet
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2332 980ebf18-57e1-0310-9a29-db15c13687c0
-rw-r--r--conf/redhat/puppet.spec10
1 files changed, 8 insertions, 2 deletions
diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec
index ca4c9b132..af3ab5e9e 100644
--- a/conf/redhat/puppet.spec
+++ b/conf/redhat/puppet.spec
@@ -106,8 +106,10 @@ 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 || :
+if [ $1 -gt 1 ] ; then
+ /usr/sbin/usermod -d /var/lib/puppet puppet || :
+fi
%post
/sbin/chkconfig --add puppet
exit 0
@@ -136,6 +138,10 @@ fi
%{__rm} -rf %{buildroot}
%changelog
+* Thu Feb 15 2007 David Lutterkort <dlutter@redhat.com> - 0.22.2
+- Set puppet's homedir to /var/lib/puppet, not /var/puppet (no migration
+ of existing homedirs though)
+
* Mon Feb 12 2007 David Lutterkort <dlutter@redhat.com> - 0.22.1-2
- Fix bogus config parameter in puppetd.conf