summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-23 05:11:50 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-23 05:11:50 +0000
commitdb5494fff2fe521d616ba726e9ab2d3bafb94a21 (patch)
tree5ec94db4e4bf345e6d76d095ad7dbd358f7b41d9 /lib
parentbfb5506ee194a1c45c18d2eb60aa0af590fffa7f (diff)
downloadpuppet-db5494fff2fe521d616ba726e9ab2d3bafb94a21.tar.gz
puppet-db5494fff2fe521d616ba726e9ab2d3bafb94a21.tar.xz
puppet-db5494fff2fe521d616ba726e9ab2d3bafb94a21.zip
Fixing #421 by changing the rundir to /var/puppet/run.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2077 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/configuration.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/puppet/configuration.rb b/lib/puppet/configuration.rb
index b2b0046a5..4fbcbe135 100644
--- a/lib/puppet/configuration.rb
+++ b/lib/puppet/configuration.rb
@@ -42,14 +42,10 @@ module Puppet
this directory can be removed without causing harm (although it
might result in spurious service restarts)."
},
- :rundir => { :default => "$vardir/run",
+ :rundir => { :default => "/var/run/puppet",
:mode => 01777,
:desc => "Where Puppet PID files are kept."
},
- :lockdir => { :default => "$vardir/locks",
- :mode => 01777,
- :desc => "Where lock files are kept."
- },
:statefile => { :default => "$statedir/state.yaml",
:mode => 0660,
:desc => "Where puppetd and puppetmasterd store state associated