You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
1.3 KiB
46 lines
1.3 KiB
10 years ago
|
From 9deed392392c229fd8f20fe5e52a4853f8363484 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Haikel Guemar <hguemar@fedoraproject.org>
|
||
|
|
Date: Thu, 9 Apr 2015 01:38:19 +0200
|
||
|
|
Subject: [PATCH 1/2] 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 07e33a6..82b4558 100644
|
||
|
|
--- a/lib/puppet/util/run_mode.rb
|
||
|
|
+++ b/lib/puppet/util/run_mode.rb
|
||
|
|
@@ -55,23 +55,23 @@ module Puppet
|
||
|
|
|
||
|
|
class UnixRunMode < RunMode
|
||
|
|
def conf_dir
|
||
|
|
- which_dir("/etc/puppetlabs/puppet", "~/.puppet")
|
||
|
|
+ which_dir("/etc/puppet", "~/.puppet")
|
||
|
|
end
|
||
|
|
|
||
|
|
def code_dir
|
||
|
|
- which_dir("/etc/puppetlabs/code", "~/.puppet/code")
|
||
|
|
+ which_dir("/etc/puppet", "~/.puppet/code")
|
||
|
|
end
|
||
|
|
|
||
|
|
def var_dir
|
||
|
|
- which_dir("/opt/puppetlabs/puppet/cache", "~/.puppet/var")
|
||
|
|
+ which_dir("/var/lib/puppet/cache", "~/.puppet/var")
|
||
|
|
end
|
||
|
|
|
||
|
|
def run_dir
|
||
|
|
- which_dir("/var/run/puppetlabs", "~/.puppet/var/run")
|
||
|
|
+ which_dir("/var/run/puppet", "~/.puppet/var/run")
|
||
|
|
end
|
||
|
|
|
||
|
|
def log_dir
|
||
|
|
- which_dir("/var/log/puppetlabs", "~/.puppet/var/log")
|
||
|
|
+ which_dir("/var/log/puppet", "~/.puppet/var/log")
|
||
|
|
end
|
||
|
|
end
|
||
|
|
|
||
|
|
--
|
||
|
|
2.3.5
|
||
|
|
|