From 88c57975f8b3832688b00afc4f41b6dd87153ec2 Mon Sep 17 00:00:00 2001 From: Lucien Weller Date: Wed, 11 Sep 2019 23:30:38 +0200 Subject: [PATCH 1/5] Fix-puppet-paths --- lib/puppet/provider/package/puppet_gem.rb | 2 +- lib/puppet/util/run_mode.rb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/puppet/provider/package/puppet_gem.rb b/lib/puppet/provider/package/puppet_gem.rb index 8d876a0..86752b7 100644 --- a/lib/puppet/provider/package/puppet_gem.rb +++ b/lib/puppet/provider/package/puppet_gem.rb @@ -12,6 +12,6 @@ Puppet::Type.type(:package).provide :puppet_gem, :parent => :gem do # sort out the absolute path. commands :gemcmd => "gem" else - commands :gemcmd => "/opt/puppetlabs/puppet/bin/gem" + commands :gemcmd => "/usr/bin/gem" end end 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("/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.20.1