diff options
| author | James Turnbull <james@lovedthanlost.net> | 2010-03-31 12:39:54 +1100 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 385506ff6209df909dc1f39f00a700274c530755 (patch) | |
| tree | 20b77155e47935f88d44c47cc11d648bef0de352 /lib/puppet | |
| parent | b494427ff76ec8ec90d6d389b32a7c9fe9b7f20d (diff) | |
| download | puppet-385506ff6209df909dc1f39f00a700274c530755.tar.gz puppet-385506ff6209df909dc1f39f00a700274c530755.tar.xz puppet-385506ff6209df909dc1f39f00a700274c530755.zip | |
Fixes #3460 - Makes Puppet FHS compliant by moving /var/puppet to /var/lib/puppet
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/defaults.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/reference/configuration.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 701b785f1..97172073b 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -16,7 +16,7 @@ module Puppet else # Else, use system-wide directories. conf = "/etc/puppet" - var = "/var/puppet" + var = "/var/lib/puppet" end self.setdefaults(:main, diff --git a/lib/puppet/reference/configuration.rb b/lib/puppet/reference/configuration.rb index 60cbb8639..477b9a7ab 100644 --- a/lib/puppet/reference/configuration.rb +++ b/lib/puppet/reference/configuration.rb @@ -25,7 +25,7 @@ config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc str += "" val = object.default if name.to_s == "vardir" - val = "/var/puppet" + val = "/var/lib/puppet" elsif name.to_s == "confdir" val = "/etc/puppet" end |