diff options
| author | Luke Kanies <luke@madstop.com> | 2007-11-23 20:07:41 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-11-23 20:07:41 -0600 |
| commit | 880a8e2ba3168c4578dfad0b03d6eccd20f36ae2 (patch) | |
| tree | 245f6ce0feff0ee671b985346b7b1b47cb819426 | |
| parent | 696f1fbe93062ce627c3c3ca035ea9383bb925f4 (diff) | |
| download | puppet-880a8e2ba3168c4578dfad0b03d6eccd20f36ae2.tar.gz puppet-880a8e2ba3168c4578dfad0b03d6eccd20f36ae2.tar.xz puppet-880a8e2ba3168c4578dfad0b03d6eccd20f36ae2.zip | |
Adding patch 20071020020745-6856b-dbc63ff3f137a4039fb997b9978202d52f621e8c.patch from womble -- Fix some residual instances of /var/run fever
| -rw-r--r-- | debian/puppet.dirs | 1 | ||||
| -rw-r--r-- | debian/puppet.files | 1 | ||||
| -rw-r--r-- | debian/puppet.init | 4 | ||||
| -rw-r--r-- | debian/puppetmaster.init | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/debian/puppet.dirs b/debian/puppet.dirs index faeb94deb..95ccc1e1b 100644 --- a/debian/puppet.dirs +++ b/debian/puppet.dirs @@ -1,7 +1,6 @@ usr/sbin usr/lib/ruby/1.8 var/log/puppet -var/run etc/puppet/files usr/share/vim/addons/ftdetect usr/share/vim/vim70/syntax diff --git a/debian/puppet.files b/debian/puppet.files index e66044524..d92ac32e9 100644 --- a/debian/puppet.files +++ b/debian/puppet.files @@ -2,6 +2,5 @@ usr/bin/puppet usr/bin/puppetdoc usr/sbin/puppetd usr/lib/ruby/1.8/ -var/run var/log/puppet etc/puppet/puppet.conf diff --git a/debian/puppet.init b/debian/puppet.init index 4e7b48718..da9f548cb 100644 --- a/debian/puppet.init +++ b/debian/puppet.init @@ -13,12 +13,12 @@ test -x $DAEMON || exit 0 . /lib/lsb/init-functions start_puppet() { - start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ + start-stop-daemon --start --quiet --pidfile /var/run/puppet/$NAME.pid \ --startas $DAEMON -- $DAEMON_OPTS } stop_puppet() { - start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid + start-stop-daemon --stop --quiet --pidfile /var/run/puppet/$NAME.pid } if [ ! -d /var/run/puppet ]; then diff --git a/debian/puppetmaster.init b/debian/puppetmaster.init index 2799745a3..ea5c1bafb 100644 --- a/debian/puppetmaster.init +++ b/debian/puppetmaster.init @@ -20,12 +20,12 @@ fi chown puppet:puppet /var/run/puppet start_puppetmaster() { - start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ + start-stop-daemon --start --quiet --pidfile /var/run/puppet/$NAME.pid \ --startas $DAEMON -- $DAEMON_OPTS } stop_puppetmaster() { - start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid + start-stop-daemon --stop --quiet --pidfile /var/run/puppet/$NAME.pid } case "$1" in |