|
 |
c96a11 |
From e6d4f123893c27a3d8a6aac7b26853023433166e Mon Sep 17 00:00:00 2001
|
|
|
c96a11 |
From: Yatin Karel <ykarel@redhat.com>
|
|
|
c96a11 |
Date: Fri, 14 May 2021 08:21:46 +0000
|
|
|
c96a11 |
Subject: [PATCH] Fix puppet paths
|
|
|
c96a11 |
|
|
|
c96a11 |
---
|
|
|
c96a11 |
lib/puppet/util/run_mode.rb | 12 ++++++------
|
|
|
c96a11 |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
c96a11 |
|
|
|
c96a11 |
diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb
|
|
|
c96a11 |
index 36f38ddb0d..314bf1bd15 100644
|
|
|
c96a11 |
--- a/lib/puppet/util/run_mode.rb
|
|
|
c96a11 |
+++ b/lib/puppet/util/run_mode.rb
|
|
|
c96a11 |
@@ -63,27 +63,27 @@ module Puppet
|
|
|
c96a11 |
|
|
|
c96a11 |
class UnixRunMode < RunMode
|
|
|
c96a11 |
def conf_dir
|
|
|
c96a11 |
- which_dir("/etc/puppetlabs/puppet", "~/.puppetlabs/etc/puppet")
|
|
|
c96a11 |
+ which_dir("/etc/puppet", "~/.puppet")
|
|
|
c96a11 |
end
|
|
|
c96a11 |
|
|
|
c96a11 |
def code_dir
|
|
|
c96a11 |
- which_dir("/etc/puppetlabs/code", "~/.puppetlabs/etc/code")
|
|
|
c96a11 |
+ which_dir("/etc/puppet", "~/.puppet/code")
|
|
|
c96a11 |
end
|
|
|
c96a11 |
|
|
|
c96a11 |
def var_dir
|
|
|
c96a11 |
- which_dir("/opt/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache")
|
|
|
c96a11 |
+ which_dir("/var/lib/puppet", "~/.puppet/cache")
|
|
|
c96a11 |
end
|
|
|
c96a11 |
|
|
|
c96a11 |
def public_dir
|
|
|
c96a11 |
- which_dir("/opt/puppetlabs/puppet/public", "~/.puppetlabs/opt/puppet/public")
|
|
|
c96a11 |
+ which_dir("/var/lib/puppet", "~/.puppet/public")
|
|
|
c96a11 |
end
|
|
|
c96a11 |
|
|
|
c96a11 |
def run_dir
|
|
|
c96a11 |
- which_dir("/var/run/puppetlabs", "~/.puppetlabs/var/run")
|
|
|
c96a11 |
+ which_dir("/var/run/puppet", "~/.puppet/var/run")
|
|
|
c96a11 |
end
|
|
|
c96a11 |
|
|
|
c96a11 |
def log_dir
|
|
|
c96a11 |
- which_dir("/var/log/puppetlabs/puppet", "~/.puppetlabs/var/log")
|
|
|
c96a11 |
+ which_dir("/var/log/puppet", "~/.puppet/var/log")
|
|
|
c96a11 |
end
|
|
|
c96a11 |
end
|
|
|
c96a11 |
|
|
|
c96a11 |
--
|
|
|
c96a11 |
2.27.0
|