summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2009-03-23 14:39:54 -0500
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commitbf3359e697baf5443283b87de6183b498093a524 (patch)
treeacdf2f2a71aeefd2edf8bc22817332b35192e672 /lib
parentb41d53596cdcb6d7220b93926f6eedf171c09c46 (diff)
downloadpuppet-bf3359e697baf5443283b87de6183b498093a524.tar.gz
puppet-bf3359e697baf5443283b87de6183b498093a524.tar.xz
puppet-bf3359e697baf5443283b87de6183b498093a524.zip
Adding client and server data dirs
These replace the yaml and file dirs, since in #1943 we're merging the file and yaml Terminus classes. Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/defaults.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index b2e849264..812680d19 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -459,6 +459,8 @@ module Puppet
# it to be in the server section (#1138).
:yamldir => {:default => "$vardir/yaml", :owner => "service", :group => "service", :mode => "750",
:desc => "The directory in which YAML data is stored, usually in a subdirectory."},
+ :server_datadir => {:default => "$vardir/server_data", :owner => "$user", :group => "$user", :mode => "750",
+ :desc => "The directory in which serialized data is stored, usually in a subdirectory."},
:reports => ["store",
"The list of reports to generate. All reports are looked for
in puppet/reports/<name>.rb, and multiple report names should be
@@ -502,6 +504,8 @@ module Puppet
},
:clientyamldir => {:default => "$vardir/client_yaml", :mode => "750",
:desc => "The directory in which client-side YAML data is stored."},
+ :client_datadir => {:default => "$vardir/client_data", :mode => "750",
+ :desc => "The directory in which serialized data is stored on the client."},
:classfile => { :default => "$statedir/classes.txt",
:owner => "root",
:mode => 0644,