Fixing the yamldir group to be a group instead of user

Signed-off-by: Luke Kanies <luke@madstop.com>

2 files changed, 6 insertions, 1 deletions

diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 9997acb5f..98610949b 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -426,7 +426,7 @@ module Puppet
             See http://reductivelabs.com/puppet/trac/wiki/UsingMongrel for more information."],
         # To make sure this directory is created before we try to use it on the server, we need
         # it to be in the server section (#1138).
-        :yamldir => {:default => "$vardir/yaml", :owner => "$user", :group => "$user", :mode => "750",
+        :yamldir => {:default => "$vardir/yaml", :owner => "$user", :group => "$group", :mode => "750",
             :desc => "The directory in which YAML data is stored, usually in a subdirectory."},
         :reports => ["store",
             "The list of reports to generate.  All reports are looked for
diff --git a/spec/integration/defaults.rb b/spec/integration/defaults.rb
index b0fd7254a..681b5d121 100755
--- a/spec/integration/defaults.rb
+++ b/spec/integration/defaults.rb
@@ -43,6 +43,11 @@ describe "Puppet defaults" do
         Puppet.settings.setting(:clientyamldir).group.should be_nil
     end
 
+    it "should use the service user and group for the yamldir" do
+        Puppet.settings.setting(:yamldir).owner.should == Puppet.settings[:user]
+        Puppet.settings.setting(:yamldir).group.should == Puppet.settings[:group]
+    end
+
     # See #1232
     it "should not specify a user or group for the rundir" do
         Puppet.settings.setting(:rundir).owner.should be_nil