From d90ec7907aa785dfd592da3e0335ceaeb554b2d8 Mon Sep 17 00:00:00 2001 From: James Turnbull Date: Wed, 31 Mar 2010 12:39:54 +1100 Subject: Fixes #3460 - Makes Puppet FHS compliant by moving /var/puppet to /var/lib/puppet --- ext/nagios/check_puppet.rb | 2 +- ext/regexp_nodes/regexp_nodes.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ext') diff --git a/ext/nagios/check_puppet.rb b/ext/nagios/check_puppet.rb index 00d9ac987..c569566ad 100755 --- a/ext/nagios/check_puppet.rb +++ b/ext/nagios/check_puppet.rb @@ -11,7 +11,7 @@ class CheckPuppet # default options OPTIONS = { - :statefile => "/var/puppet/state/state.yaml", + :statefile => "/var/lib/puppet/state/state.yaml", :process => "puppetd", :interval => 30, } diff --git a/ext/regexp_nodes/regexp_nodes.rb b/ext/regexp_nodes/regexp_nodes.rb index 1f4fdbc3a..a9e7ed6a9 100644 --- a/ext/regexp_nodes/regexp_nodes.rb +++ b/ext/regexp_nodes/regexp_nodes.rb @@ -43,14 +43,14 @@ require 'set' # set up some nice logging require 'logger' # XXX flip this for production vs local sandbox -# $LOG = Logger.new("/var/puppet/log/extnodes.log") +# $LOG = Logger.new("/var/lib/puppet/log/extnodes.log") # $LOG.level = Logger::FATAL $LOG = Logger.new($stderr) $LOG.level = Logger::DEBUG # paths for files we use will be relative to this directory # XXX flip this for production vs local sandbox -# WORKINGDIR = "/var/puppet/bin" +# WORKINGDIR = "/var/lib/puppet/bin" WORKINGDIR = Dir.pwd # This class holds all the methods for creating and accessing the properties @@ -154,7 +154,7 @@ class ExternalNode # directories to get the parameter name, then use the names of the files # contained in there for the values of those parameters. # - # ex: cat /var/puppet/bin/parameters/environment/production + # ex: cat /var/lib/puppet/bin/parameters/environment/production # ^prodweb # would set parameters["environment"] = "production" for prodweb001 def match_parameters(fullpath) -- cgit