diff options
| author | Luke Kanies <luke@madstop.com> | 2008-07-03 17:27:11 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-07-03 17:27:11 -0500 |
| commit | ba12d3000d31dbccb3b60320eae6c1be302e0bd5 (patch) | |
| tree | a547aaf7aa4bb60121416a9c0e1c6ba073e19eff /lib/puppet/indirector | |
| parent | 7a6ae299621a16fa7fd8ab0fbd2c05fe723cffa4 (diff) | |
Fixed #1232 - the rundir no longer specifies a user/group,
and there are now client- and server-specific yaml directories.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet/indirector')
| -rw-r--r-- | lib/puppet/indirector/yaml.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |