summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-11-23 20:07:03 -0600
committerLuke Kanies <luke@madstop.com>2007-11-23 20:07:03 -0600
commit696f1fbe93062ce627c3c3ca035ea9383bb925f4 (patch)
tree719f1ea7919c71ae41219db3479409a4e9827def
parent7a95017c5e374e9771cd90cb6b7b55be011915c5 (diff)
downloadpuppet-696f1fbe93062ce627c3c3ca035ea9383bb925f4.tar.gz
puppet-696f1fbe93062ce627c3c3ca035ea9383bb925f4.tar.xz
puppet-696f1fbe93062ce627c3c3ca035ea9383bb925f4.zip
Adding patch 20071020015958-6856b-69efa7868cf3df3f2a2da6fcfc3b794bbb532c7f.patch from womble -- Remove rundir from puppet.conf, and add a NEWS entry to document these changes
-rw-r--r--debian/puppet.NEWS11
-rw-r--r--debian/puppet.conf1
2 files changed, 11 insertions, 1 deletions
diff --git a/debian/puppet.NEWS b/debian/puppet.NEWS
index 13568a54c..a712aafd4 100644
--- a/debian/puppet.NEWS
+++ b/debian/puppet.NEWS
@@ -1,3 +1,14 @@
+puppet (0.23.2-12) unstable; urgency=low
+
+ * Handling of the rundir setting has been changed; we now store PID files
+ in /var/run/puppet, and the initscripts have been modified to ensure
+ that this directory exists on startup. It is no longer necessary to set
+ rundir explicitly in /etc/puppet/puppet.conf, and you should ensure that
+ you have no explicit rundir setting in your puppet.conf unless you want
+ to use a custom rundir setting for your own local purposes.
+
+ -- Matthew Palmer <mpalmer@debian.org> Sat, 20 Oct 2007 11:58:58 +1000
+
puppet (0.23.2-3) unstable; urgency=low
* This version of Puppet makes a fairly major change to the location of
diff --git a/debian/puppet.conf b/debian/puppet.conf
index ea60968e9..e17d039bb 100644
--- a/debian/puppet.conf
+++ b/debian/puppet.conf
@@ -1,7 +1,6 @@
[main]
logdir=/var/log/puppet
vardir=/var/lib/puppet
-rundir=/var/run
ssldir=/var/lib/puppet/ssl
[puppetmasterd]