From d90ec7907aa785dfd592da3e0335ceaeb554b2d8 Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Wed, 31 Mar 2010 12:39:54 +1100
Subject: Fixes #3460 - Makes Puppet FHS compliant by moving /var/puppet to
 /var/lib/puppet

---
 lib/puppet/defaults.rb                | 2 +-
 lib/puppet/reference/configuration.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

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
-- 
cgit