From e6d4f123893c27a3d8a6aac7b26853023433166e Mon Sep 17 00:00:00 2001
From: Yatin Karel <ykarel@redhat.com>
Date: Fri, 14 May 2021 08:21:46 +0000
Subject: [PATCH] Fix puppet paths

---
 lib/puppet/util/run_mode.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb
index 36f38ddb0d..314bf1bd15 100644
--- a/lib/puppet/util/run_mode.rb
+++ b/lib/puppet/util/run_mode.rb
@@ -63,27 +63,27 @@ 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 public_dir
-        which_dir("/opt/puppetlabs/puppet/public", "~/.puppetlabs/opt/puppet/public")
+        which_dir("/var/lib/puppet", "~/.puppet/public")
       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.27.0