From b58008e3dbe691408a16f9e2cf66c3e7ce0d100a Mon Sep 17 00:00:00 2001 From: Jon Craig Date: Thu, 14 Mar 2013 20:44:53 +0100 Subject: [PATCH] jcraig: updated path info to conform to CSW standards --- lib/puppet/reference/configuration.rb | 4 ++-- lib/puppet/util/run_mode.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/puppet/reference/configuration.rb b/lib/puppet/reference/configuration.rb index e7f4954..d62e1b1 100644 --- a/lib/puppet/reference/configuration.rb +++ b/lib/puppet/reference/configuration.rb @@ -24,9 +24,9 @@ config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc str << "" val = object.default if name.to_s == "vardir" - val = "/var/lib/puppet" + val = "/var/opt/csw/puppet" elsif name.to_s == "confdir" - val = "/etc/puppet" + val = "/etc/opt/csw/puppet" end # Leave out the section information; it was apparently confusing people. diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb index 9a736fb..683ef54 100644 --- a/lib/puppet/util/run_mode.rb +++ b/lib/puppet/util/run_mode.rb @@ -55,11 +55,11 @@ module Puppet class UnixRunMode < RunMode def conf_dir - which_dir("/etc/puppet", "~/.puppet") + which_dir("/etc/opt/csw/puppet", "~/.puppet") end def var_dir - which_dir("/var/lib/puppet", "~/.puppet/var") + which_dir("/var/opt/csw/puppet", "~/.puppet/var") end end -- 1.8.1.4