summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2009-02-27 17:17:04 -0600
committerJames Turnbull <james@lovedthanlost.net>2009-02-28 11:09:10 +1100
commitcf1cb1474f13ae2fc4ec27142fd34d494826c929 (patch)
tree3d6a3dd26cf255923b0aa6ed33a60e2c866e8300 /lib
parent5f73eb553fd083b558fb9553b0c07b6019d0ccee (diff)
downloadpuppet-cf1cb1474f13ae2fc4ec27142fd34d494826c929.tar.gz
puppet-cf1cb1474f13ae2fc4ec27142fd34d494826c929.tar.xz
puppet-cf1cb1474f13ae2fc4ec27142fd34d494826c929.zip
Moving the clientyamldir setting into the puppetd section
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/defaults.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index ef170011f..06469431d 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -384,8 +384,6 @@ module Puppet
# it to be in the server section (#1138).
:yamldir => {:default => "$vardir/yaml", :owner => "$user", :group => "$user", :mode => "750",
:desc => "The directory in which YAML data is stored, usually in a subdirectory."},
- :clientyamldir => {:default => "$vardir/client_yaml", :mode => "750",
- :desc => "The directory in which client-side YAML data is stored."},
:reports => ["store",
"The list of reports to generate. All reports are looked for
in puppet/reports/<name>.rb, and multiple report names should be
@@ -425,6 +423,8 @@ module Puppet
this file reflects the state discovered through interacting
with clients."
},
+ :clientyamldir => {:default => "$vardir/client_yaml", :mode => "750",
+ :desc => "The directory in which client-side YAML data is stored."},
:classfile => { :default => "$statedir/classes.txt",
:owner => "root",
:mode => 0644,