diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/defaults.rb | 6 | ||||
| -rw-r--r-- | lib/puppet/indirector/yaml.rb | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 472d98c4f..5f71bb8b7 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -69,8 +69,6 @@ module Puppet :rundir => { :default => rundir, :mode => 01777, - :owner => "$user", - :group => "$group", :desc => "Where Puppet PID files are kept." }, :genconfig => [false, @@ -358,7 +356,9 @@ module Puppet # 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", - :desc => "The directory in which YAML data is stored, usually in a subdirectory."} + :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."} ) self.setdefaults(:puppetd, diff --git a/lib/puppet/indirector/yaml.rb b/lib/puppet/indirector/yaml.rb index 23bca02b8..3573ba560 100644 --- a/lib/puppet/indirector/yaml.rb +++ b/lib/puppet/indirector/yaml.rb @@ -36,7 +36,8 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus # Return the path to a given node's file. def path(name) - File.join(Puppet[:yamldir], self.class.indirection_name.to_s, name.to_s + ".yaml") + base = (Puppet[:name] == "puppetmasterd") ? Puppet[:yamldir] : Puppet[:clientyamldir] + File.join(base, self.class.indirection_name.to_s, name.to_s + ".yaml") end private |