From 23bcde066d9915952b9bf2c8fd0770a2ce9422ce Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Wed, 29 Apr 2015 01:38:35 +0200 Subject: [PATCH 1/5] Fix puppet paths --- lib/puppet/util/run_mode.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb index cf6c461..777156a 100644 --- a/lib/puppet/util/run_mode.rb +++ b/lib/puppet/util/run_mode.rb @@ -59,23 +59,23 @@ module Puppet class UnixRunMode < RunMode def conf_dir - which_dir("/etc/puppetlabs/puppet", "~/.puppetlabs/etc/puppet") + which_dir("/etc/puppet", "~/.puppet") end def code_dir - which_dir("/etc/puppetlabs/code", "~/.puppetlabs/etc/code") + which_dir("/etc/puppet", "~/.puppet/code") end def var_dir - which_dir("/opt/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache") + which_dir("/var/lib/puppet", "~/.puppet/cache") end def run_dir - which_dir("/var/run/puppetlabs", "~/.puppetlabs/var/run") + which_dir("/var/run/puppet", "~/.puppet/var/run") end def log_dir - which_dir("/var/log/puppetlabs/puppet", "~/.puppetlabs/var/log") + which_dir("/var/log/puppet", "~/.puppet/var/log") end end -- 2.19.2