diff options
| author | James Turnbull <james@lovedthanlost.net> | 2010-03-31 12:39:54 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-04-01 12:04:03 +1100 |
| commit | d90ec7907aa785dfd592da3e0335ceaeb554b2d8 (patch) | |
| tree | 472c1d34e2195e0fe1268d268ad71f8d40a25716 /lib/puppet | |
| parent | ae0b0bf23e418e8c6665e9dc135148b78bdbd913 (diff) | |
| download | puppet-d90ec7907aa785dfd592da3e0335ceaeb554b2d8.tar.gz puppet-d90ec7907aa785dfd592da3e0335ceaeb554b2d8.tar.xz puppet-d90ec7907aa785dfd592da3e0335ceaeb554b2d8.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 5901d1983..e78b20fe2 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 |