summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-05-25 04:07:52 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-05-25 04:07:52 +0000
commitac686e8cf1b1b87c3e749c09d966467a8aaa589a (patch)
tree661f601af2d91c71f261cb3d0b5bdcd8e6af882a
parent25d5ebd4f5b37d18153942f634f8a3e69daf4288 (diff)
downloadpuppet-ac686e8cf1b1b87c3e749c09d966467a8aaa589a.tar.gz
puppet-ac686e8cf1b1b87c3e749c09d966467a8aaa589a.tar.xz
puppet-ac686e8cf1b1b87c3e749c09d966467a8aaa589a.zip
Changing the location of the classes.txt to the state dir
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2533 980ebf18-57e1-0310-9a29-db15c13687c0
-rw-r--r--CHANGELOG3
-rw-r--r--lib/puppet/configuration.rb2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 648587401..426de19ed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+ Changed the location of the classes.txt to the state
+ directory.
+
Added better error reporting on unmatched brackets.
Moved puppetd and puppetmasterd to sbin in svn and fixed install.rb
diff --git a/lib/puppet/configuration.rb b/lib/puppet/configuration.rb
index d1526e2be..5f078d951 100644
--- a/lib/puppet/configuration.rb
+++ b/lib/puppet/configuration.rb
@@ -318,7 +318,7 @@ module Puppet
:mode => 0660,
:desc => "Where puppetd caches the local configuration. An
extension indicating the cache format is added automatically."},
- :classfile => { :default => "$confdir/classes.txt",
+ :classfile => { :default => "$statedir/classes.txt",
:owner => "root",
:mode => 0644,
:desc => "The file in which puppetd stores a list of the classes