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>

2 files changed, 12 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,
diff --git a/spec/integration/defaults.rb b/spec/integration/defaults.rb
index 1888813f5..8cbf5e46b 100755
--- a/spec/integration/defaults.rb
+++ b/spec/integration/defaults.rb
@@ -48,6 +48,14 @@ describe "Puppet defaults" do
         Puppet.settings[:yamldir].should_not == Puppet.settings[:clientyamldir]
     end
 
+    it "should have a client_datadir setting" do
+        Puppet.settings[:client_datadir].should_not be_nil
+    end
+
+    it "should have different values for the server_datadir and client_datadir" do
+        Puppet.settings[:server_datadir].should_not == Puppet.settings[:client_datadir]
+    end
+
     # See #1232
     it "should not specify a user or group for the clientyamldir" do
         Puppet.settings.setting(:clientyamldir).owner.should be_nil