Sophie

Sophie

distrib > Mageia > 6 > armv7hl > media > core-updates-src > by-pkgid > 7aac75344e1ec6fec7fa08a6e54ca624 > files > 6

puppet-4.2.1-4.4.mga6.src.rpm


puppet does not belong in /opt, so replace it with /var/lib with:

find . -type f |xargs sed -i 's+/opt/puppetlabs/+/var/lib/puppetlabs/+g'

Signed-off-by: Thomas Backlund <tmb@mageia.org>

diff -Nurp puppet-4.2.1.orig/ext/debian/puppet.init puppet-4.2.1/ext/debian/puppet.init
--- puppet-4.2.1.orig/ext/debian/puppet.init	2015-07-21 20:09:08.000000000 +0300
+++ puppet-4.2.1/ext/debian/puppet.init	2018-04-07 01:07:25.687833130 +0300
@@ -8,8 +8,8 @@
 # Default-Stop:      0 1 6
 ### END INIT INFO
 
-PATH=/opt/puppetlabs/puppet/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/opt/puppetlabs/puppet/bin/puppet
+PATH=/var/lib/puppetlabs/puppet/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/var/lib/puppetlabs/puppet/bin/puppet
 DAEMON_OPTS=""
 NAME="agent"
 PROCNAME="puppet"
diff -Nurp puppet-4.2.1.orig/ext/osx/puppet.plist puppet-4.2.1/ext/osx/puppet.plist
--- puppet-4.2.1.orig/ext/osx/puppet.plist	2015-07-21 20:09:08.000000000 +0300
+++ puppet-4.2.1/ext/osx/puppet.plist	2018-04-07 01:07:25.667833315 +0300
@@ -5,7 +5,7 @@
         <key>EnvironmentVariables</key>
         <dict>
                 <key>PATH</key>
-                <string>/opt/puppetlabs/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
+                <string>/var/lib/puppetlabs/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
                 <key>LANG</key>
                 <string>en_US.UTF-8</string>
         </dict>
@@ -15,7 +15,7 @@
         <true/>
         <key>ProgramArguments</key>
         <array>
-                <string>/opt/puppetlabs/bin/puppet</string>
+                <string>/var/lib/puppetlabs/bin/puppet</string>
                 <string>agent</string>
                 <string>--verbose</string>
                 <string>--no-daemonize</string>
diff -Nurp puppet-4.2.1.orig/ext/rack/config.ru puppet-4.2.1/ext/rack/config.ru
--- puppet-4.2.1.orig/ext/rack/config.ru	2015-07-21 20:09:08.000000000 +0300
+++ puppet-4.2.1/ext/rack/config.ru	2018-04-07 01:07:25.687833130 +0300
@@ -15,7 +15,7 @@ ARGV << "--rack"
 # --logdir, --rundir to prevent reading configuration from
 # ~/ based pathing.
 ARGV << "--confdir" << "/etc/puppetlabs/puppet"
-ARGV << "--vardir"  << "/opt/puppetlabs/server/data/puppetmaster"
+ARGV << "--vardir"  << "/var/lib/puppetlabs/server/data/puppetmaster"
 ARGV << "--logdir"  << "/var/log/puppetlabs/puppetmaster"
 ARGV << "--rundir"  << "/var/run/puppetlabs/puppetmaster"
 ARGV << "--codedir"  << "/etc/puppetlabs/code"
diff -Nurp puppet-4.2.1.orig/ext/redhat/client.init puppet-4.2.1/ext/redhat/client.init
--- puppet-4.2.1.orig/ext/redhat/client.init	2015-07-21 20:09:08.000000000 +0300
+++ puppet-4.2.1/ext/redhat/client.init	2018-04-07 01:07:25.687833130 +0300
@@ -13,13 +13,13 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-PATH=/opt/puppetlabs/puppet/bin:/usr/bin:/sbin:/bin:/usr/sbin
+PATH=/var/lib/puppetlabs/puppet/bin:/usr/bin:/sbin:/bin:/usr/sbin
 export PATH
 
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
 lockfile=/var/lock/subsys/puppet
 pidfile=/var/run/puppetlabs/agent.pid
-puppetd=/opt/puppetlabs/puppet/bin/puppet
+puppetd=/var/lib/puppetlabs/puppet/bin/puppet
 RETVAL=0
 
 PUPPET_OPTS="agent "
diff -Nurp puppet-4.2.1.orig/ext/suse/client.init puppet-4.2.1/ext/suse/client.init
--- puppet-4.2.1.orig/ext/suse/client.init	2015-07-21 20:09:08.000000000 +0300
+++ puppet-4.2.1/ext/suse/client.init	2018-04-07 01:07:25.687833130 +0300
@@ -35,7 +35,7 @@
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
 lockfile=/var/lock/subsys/puppet
 pidfile=/var/run/puppetlabs/agent.pid
-puppetd=/opt/puppetlabs/puppet/bin/puppet
+puppetd=/var/lib/puppetlabs/puppet/bin/puppet
 
 PUPPET_OPTS="agent"
 
diff -Nurp puppet-4.2.1.orig/ext/systemd/puppet.service puppet-4.2.1/ext/systemd/puppet.service
--- puppet-4.2.1.orig/ext/systemd/puppet.service	2015-07-21 20:09:08.000000000 +0300
+++ puppet-4.2.1/ext/systemd/puppet.service	2018-04-07 01:07:25.687833130 +0300
@@ -7,7 +7,7 @@ After=basic.target network.target
 EnvironmentFile=-/etc/sysconfig/puppetagent
 EnvironmentFile=-/etc/sysconfig/puppet
 EnvironmentFile=-/etc/default/puppet
-ExecStart=/opt/puppetlabs/puppet/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
+ExecStart=/var/lib/puppetlabs/puppet/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
 KillMode=process
 
 [Install]
diff -Nurp puppet-4.2.1.orig/install.rb puppet-4.2.1/install.rb
--- puppet-4.2.1.orig/install.rb	2015-07-21 20:09:08.000000000 +0300
+++ puppet-4.2.1/install.rb	2018-04-07 01:07:25.457835290 +0300
@@ -205,7 +205,7 @@ def prepare_installation
     opts.on('--codedir[=OPTIONAL]', 'Installation directory for code files', 'Default /etc/puppetlabs/code') do |codedir|
       InstallOptions.codedir = codedir
     end
-    opts.on('--vardir[=OPTIONAL]', 'Installation directory for var files', 'Default /opt/puppetlabs/puppet/cache') do |vardir|
+    opts.on('--vardir[=OPTIONAL]', 'Installation directory for var files', 'Default /var/lib/puppetlabs/puppet/cache') do |vardir|
       InstallOptions.vardir = vardir
     end
     opts.on('--rundir[=OPTIONAL]', 'Installation directory for state files', 'Default /var/run/puppetlabs') do |rundir|
@@ -283,7 +283,7 @@ def prepare_installation
   elsif $operatingsystem == "windows"
     vardir = File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "cache")
   else
-    vardir = "/opt/puppetlabs/puppet/cache"
+    vardir = "/var/lib/puppetlabs/puppet/cache"
   end
 
   if not InstallOptions.rundir.nil?
diff -Nurp puppet-4.2.1.orig/lib/puppet/defaults.rb puppet-4.2.1/lib/puppet/defaults.rb
--- puppet-4.2.1.orig/lib/puppet/defaults.rb	2015-07-21 20:09:08.000000000 +0300
+++ puppet-4.2.1/lib/puppet/defaults.rb	2018-04-07 01:07:25.897831156 +0300
@@ -1086,7 +1086,7 @@ EOT
       :desc       => "File that provides mapping between custom SSL oids and user-friendly names"
     },
     :basemodulepath => {
-      :default => "$codedir/modules#{File::PATH_SEPARATOR}/opt/puppetlabs/puppet/modules",
+      :default => "$codedir/modules#{File::PATH_SEPARATOR}/var/lib/puppetlabs/puppet/modules",
       :type => :path,
       :desc => "The search path for **global** modules. Should be specified as a
         list of directories separated by the system path separator character. (The
diff -Nurp puppet-4.2.1.orig/lib/puppet/face/config.rb puppet-4.2.1/lib/puppet/face/config.rb
--- puppet-4.2.1.orig/lib/puppet/face/config.rb	2015-07-21 20:09:08.000000000 +0300
+++ puppet-4.2.1/lib/puppet/face/config.rb	2018-04-07 01:07:25.977830405 +0300
@@ -102,7 +102,7 @@ Puppet::Face.define(:config, '0.0.1') do
 
       Set the vardir for only the agent:
 
-      $ puppet config set vardir /opt/puppetlabs/puppet/cache --section agent
+      $ puppet config set vardir /var/lib/puppetlabs/puppet/cache --section agent
     EOT
 
     when_invoked do |name, value, options|
diff -Nurp puppet-4.2.1.orig/lib/puppet/face/module/install.rb puppet-4.2.1/lib/puppet/face/module/install.rb
--- puppet-4.2.1.orig/lib/puppet/face/module/install.rb	2015-07-21 20:09:08.000000000 +0300
+++ puppet-4.2.1/lib/puppet/face/module/install.rb	2018-04-07 01:07:25.977830405 +0300
@@ -46,20 +46,20 @@ Puppet::Face.define(:module, '1.0.0') do
 
       Install a module into a specific directory:
 
-      $ puppet module install puppetlabs-vcsrepo --target-dir=/opt/puppetlabs/puppet/modules
-      Preparing to install into /opt/puppetlabs/puppet/modules ...
+      $ puppet module install puppetlabs-vcsrepo --target-dir=/var/lib/puppetlabs/puppet/modules
+      Preparing to install into /var/lib/puppetlabs/puppet/modules ...
       Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
-      /opt/puppetlabs/puppet/modules
+      /var/lib/puppetlabs/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a module into a specific directory and check for dependencies in other directories:
 
-      $ puppet module install puppetlabs-vcsrepo --target-dir=/opt/puppetlabs/puppet/modules --modulepath /etc/puppetlabs/code/modules
-      Preparing to install into /opt/puppetlabs/puppet/modules ...
+      $ puppet module install puppetlabs-vcsrepo --target-dir=/var/lib/puppetlabs/puppet/modules --modulepath /etc/puppetlabs/code/modules
+      Preparing to install into /var/lib/puppetlabs/puppet/modules ...
       Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
-      /opt/puppetlabs/puppet/modules
+      /var/lib/puppetlabs/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a module from a release archive:
diff -Nurp puppet-4.2.1.orig/lib/puppet/face/module/list.rb puppet-4.2.1/lib/puppet/face/module/list.rb
--- puppet-4.2.1.orig/lib/puppet/face/module/list.rb	2015-07-21 20:09:08.000000000 +0300
+++ puppet-4.2.1/lib/puppet/face/module/list.rb	2018-04-07 01:07:25.977830405 +0300
@@ -27,7 +27,7 @@ Puppet::Face.define(:module, '1.0.0') do
         ├── puppetlabs-mysql (v0.0.1)
         ├── puppetlabs-sqlite (v0.0.1)
         └── puppetlabs-stdlib (v2.2.1)
-        /opt/puppetlabs/puppet/modules (no modules installed)
+        /var/lib/puppetlabs/puppet/modules (no modules installed)
 
       List installed modules in a tree view:
 
@@ -38,7 +38,7 @@ Puppet::Face.define(:module, '1.0.0') do
           ├─┬ puppetlabs-mysql (v0.0.1)
           │ └── bodepd-create_resources (v0.0.1)
           └── puppetlabs-sqlite (v0.0.1)
-        /opt/puppetlabs/puppet/modules (no modules installed)
+        /var/lib/puppetlabs/puppet/modules (no modules installed)
 
       List installed modules from a specified environment:
 
@@ -49,12 +49,12 @@ Puppet::Face.define(:module, '1.0.0') do
         ├── puppetlabs-mysql (v0.0.1)
         ├── puppetlabs-sqlite (v0.0.1)
         └── puppetlabs-stdlib (v2.2.1)
-        /opt/puppetlabs/puppet/modules (no modules installed)
+        /var/lib/puppetlabs/puppet/modules (no modules installed)
 
       List installed modules from a specified modulepath:
 
-      $ puppet module list --modulepath /opt/puppetlabs/puppet/modules
-        /opt/puppetlabs/puppet/modules (no modules installed)
+      $ puppet module list --modulepath /var/lib/puppetlabs/puppet/modules
+        /var/lib/puppetlabs/puppet/modules (no modules installed)
     EOT
 
     when_invoked do |options|
diff -Nurp puppet-4.2.1.orig/lib/puppet/face/module/uninstall.rb puppet-4.2.1/lib/puppet/face/module/uninstall.rb
--- puppet-4.2.1.orig/lib/puppet/face/module/uninstall.rb	2015-07-21 20:09:08.000000000 +0300
+++ puppet-4.2.1/lib/puppet/face/module/uninstall.rb	2018-04-07 01:07:25.977830405 +0300
@@ -16,8 +16,8 @@ Puppet::Face.define(:module, '1.0.0') do
 
       Uninstall a module from a specific directory:
 
-      $ puppet module uninstall puppetlabs-ssh --modulepath /opt/puppetlabs/puppet/modules
-      Removed /opt/puppetlabs/puppet/modules/ssh (v1.0.0)
+      $ puppet module uninstall puppetlabs-ssh --modulepath /var/lib/puppetlabs/puppet/modules
+      Removed /var/lib/puppetlabs/puppet/modules/ssh (v1.0.0)
 
       Uninstall a module from a specific environment:
 
diff -Nurp puppet-4.2.1.orig/lib/puppet/provider/package/puppet_gem.rb puppet-4.2.1/lib/puppet/provider/package/puppet_gem.rb
--- puppet-4.2.1.orig/lib/puppet/provider/package/puppet_gem.rb	2015-07-21 20:09:08.000000000 +0300
+++ puppet-4.2.1/lib/puppet/provider/package/puppet_gem.rb	2018-04-07 01:07:25.987830311 +0300
@@ -12,6 +12,6 @@ Puppet::Type.type(:package).provide :pup
     # sort out the absolute path.
     commands :gemcmd => "gem"
   else
-    commands :gemcmd => "/opt/puppetlabs/puppet/bin/gem"
+    commands :gemcmd => "/var/lib/puppetlabs/puppet/bin/gem"
   end
 end
diff -Nurp puppet-4.2.1.orig/lib/puppet/reference/configuration.rb puppet-4.2.1/lib/puppet/reference/configuration.rb
--- puppet-4.2.1.orig/lib/puppet/reference/configuration.rb	2015-07-21 20:09:08.000000000 +0300
+++ puppet-4.2.1/lib/puppet/reference/configuration.rb	2018-04-07 01:07:25.897831156 +0300
@@ -23,7 +23,7 @@ config = Puppet::Util::Reference.newrefe
     # Now print the data about the item.
     val = object.default
     if name.to_s == "vardir"
-      val = "/opt/puppetlabs/puppet/cache"
+      val = "/var/lib/puppetlabs/puppet/cache"
     elsif name.to_s == "confdir"
       val = "/etc/puppetlabs/puppet"
     end
diff -Nurp puppet-4.2.1.orig/lib/puppet/util/run_mode.rb puppet-4.2.1/lib/puppet/util/run_mode.rb
--- puppet-4.2.1.orig/lib/puppet/util/run_mode.rb	2015-07-21 20:09:08.000000000 +0300
+++ puppet-4.2.1/lib/puppet/util/run_mode.rb	2018-04-07 01:07:25.787832189 +0300
@@ -67,7 +67,7 @@ module Puppet
       end
 
       def var_dir
-        which_dir("/opt/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache")
+        which_dir("/var/lib/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache")
       end
 
       def run_dir
diff -Nurp puppet-4.2.1.orig/man/man5/puppet.conf.5 puppet-4.2.1/man/man5/puppet.conf.5
--- puppet-4.2.1.orig/man/man5/puppet.conf.5	2015-07-21 20:09:09.000000000 +0300
+++ puppet-4.2.1/man/man5/puppet.conf.5	2018-04-07 01:07:25.667833315 +0300
@@ -121,7 +121,7 @@ The search path for \fBglobal\fR modules
 These are the modules that will be used by \fIall\fR environments\. Note that the \fBmodules\fR directory of the active environment will have priority over any global directories\. For more info, see http://docs\.puppetlabs\.com/puppet/latest/reference/environments\.html
 .
 .IP "\(bu" 4
-\fIDefault\fR: $codedir/modules:/opt/puppetlabs/puppet/modules
+\fIDefault\fR: $codedir/modules:/var/lib/puppetlabs/puppet/modules
 .
 .IP "" 0
 .
@@ -1730,7 +1730,7 @@ The user puppet master should run as\.
 Where Puppet stores dynamic and growing data\. The default for this setting is calculated specially, like \fBconfdir\fR_\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: /opt/puppetlabs/puppet/cache
+\fIDefault\fR: /var/lib/puppetlabs/puppet/cache
 .
 .IP "" 0
 .
diff -Nurp puppet-4.2.1.orig/man/man8/puppet-config.8 puppet-4.2.1/man/man8/puppet-config.8
--- puppet-4.2.1.orig/man/man8/puppet-config.8	2015-07-21 20:09:09.000000000 +0300
+++ puppet-4.2.1/man/man8/puppet-config.8	2018-04-07 01:07:25.657833411 +0300
@@ -111,7 +111,7 @@ $ puppet config set rundir /var/run/pupp
 Set the vardir for only the agent:
 .
 .P
-$ puppet config set vardir /opt/puppetlabs/puppet/cache \-\-section agent
+$ puppet config set vardir /var/lib/puppetlabs/puppet/cache \-\-section agent
 .
 .SH "COPYRIGHT AND LICENSE"
 Copyright 2011 by Puppet Labs Apache 2 license; see COPYING
diff -Nurp puppet-4.2.1.orig/man/man8/puppet-module.8 puppet-4.2.1/man/man8/puppet-module.8
--- puppet-4.2.1.orig/man/man8/puppet-module.8	2015-07-21 20:09:09.000000000 +0300
+++ puppet-4.2.1/man/man8/puppet-module.8	2018-04-07 01:07:25.657833411 +0300
@@ -340,13 +340,13 @@ $ puppet module install puppetlabs\-vcsr
 Install a module into a specific directory:
 .
 .P
-$ puppet module install puppetlabs\-vcsrepo \-\-target\-dir=/opt/puppetlabs/puppet/modules Preparing to install into /opt/puppetlabs/puppet/modules \.\.\. Downloading from http://forgeapi\.puppetlabs\.com \.\.\. Installing \-\- do not interrupt \.\.\. /opt/puppetlabs/puppet/modules └── puppetlabs\-vcsrepo (v0\.0\.4)
+$ puppet module install puppetlabs\-vcsrepo \-\-target\-dir=/var/lib/puppetlabs/puppet/modules Preparing to install into /var/lib/puppetlabs/puppet/modules \.\.\. Downloading from http://forgeapi\.puppetlabs\.com \.\.\. Installing \-\- do not interrupt \.\.\. /var/lib/puppetlabs/puppet/modules └── puppetlabs\-vcsrepo (v0\.0\.4)
 .
 .P
 Install a module into a specific directory and check for dependencies in other directories:
 .
 .P
-$ puppet module install puppetlabs\-vcsrepo \-\-target\-dir=/opt/puppetlabs/puppet/modules \-\-modulepath /etc/puppetlabs/code/modules Preparing to install into /opt/puppetlabs/puppet/modules \.\.\. Downloading from http://forgeapi\.puppetlabs\.com \.\.\. Installing \-\- do not interrupt \.\.\. /opt/puppetlabs/puppet/modules └── puppetlabs\-vcsrepo (v0\.0\.4)
+$ puppet module install puppetlabs\-vcsrepo \-\-target\-dir=/var/lib/puppetlabs/puppet/modules \-\-modulepath /etc/puppetlabs/code/modules Preparing to install into /var/lib/puppetlabs/puppet/modules \.\.\. Downloading from http://forgeapi\.puppetlabs\.com \.\.\. Installing \-\- do not interrupt \.\.\. /var/lib/puppetlabs/puppet/modules └── puppetlabs\-vcsrepo (v0\.0\.4)
 .
 .P
 Install a module from a release archive:
@@ -367,25 +367,25 @@ $ puppet module install puppetlabs\-vcsr
 List installed modules:
 .
 .P
-$ puppet module list /etc/puppetlabs/code/modules ├── bodepd\-create_resources (v0\.0\.1) ├── puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-mysql (v0\.0\.1) ├── puppetlabs\-sqlite (v0\.0\.1) └── puppetlabs\-stdlib (v2\.2\.1) /opt/puppetlabs/puppet/modules (no modules installed)
+$ puppet module list /etc/puppetlabs/code/modules ├── bodepd\-create_resources (v0\.0\.1) ├── puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-mysql (v0\.0\.1) ├── puppetlabs\-sqlite (v0\.0\.1) └── puppetlabs\-stdlib (v2\.2\.1) /var/lib/puppetlabs/puppet/modules (no modules installed)
 .
 .P
 List installed modules in a tree view:
 .
 .P
-$ puppet module list \-\-tree /etc/puppetlabs/code/modules └─┬ puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-stdlib (v2\.2\.1) ├─┬ puppetlabs\-mysql (v0\.0\.1) │ └── bodepd\-create_resources (v0\.0\.1) └── puppetlabs\-sqlite (v0\.0\.1) /opt/puppetlabs/puppet/modules (no modules installed)
+$ puppet module list \-\-tree /etc/puppetlabs/code/modules └─┬ puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-stdlib (v2\.2\.1) ├─┬ puppetlabs\-mysql (v0\.0\.1) │ └── bodepd\-create_resources (v0\.0\.1) └── puppetlabs\-sqlite (v0\.0\.1) /var/lib/puppetlabs/puppet/modules (no modules installed)
 .
 .P
 List installed modules from a specified environment:
 .
 .P
-$ puppet module list \-\-environment production /etc/puppetlabs/code/modules ├── bodepd\-create_resources (v0\.0\.1) ├── puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-mysql (v0\.0\.1) ├── puppetlabs\-sqlite (v0\.0\.1) └── puppetlabs\-stdlib (v2\.2\.1) /opt/puppetlabs/puppet/modules (no modules installed)
+$ puppet module list \-\-environment production /etc/puppetlabs/code/modules ├── bodepd\-create_resources (v0\.0\.1) ├── puppetlabs\-bacula (v0\.0\.2) ├── puppetlabs\-mysql (v0\.0\.1) ├── puppetlabs\-sqlite (v0\.0\.1) └── puppetlabs\-stdlib (v2\.2\.1) /var/lib/puppetlabs/puppet/modules (no modules installed)
 .
 .P
 List installed modules from a specified modulepath:
 .
 .P
-$ puppet module list \-\-modulepath /opt/puppetlabs/puppet/modules /opt/puppetlabs/puppet/modules (no modules installed)
+$ puppet module list \-\-modulepath /var/lib/puppetlabs/puppet/modules /var/lib/puppetlabs/puppet/modules (no modules installed)
 .
 .P
 \fBsearch\fR
@@ -409,7 +409,7 @@ $ puppet module uninstall puppetlabs\-ss
 Uninstall a module from a specific directory:
 .
 .P
-$ puppet module uninstall puppetlabs\-ssh \-\-modulepath /opt/puppetlabs/puppet/modules Removed /opt/puppetlabs/puppet/modules/ssh (v1\.0\.0)
+$ puppet module uninstall puppetlabs\-ssh \-\-modulepath /var/lib/puppetlabs/puppet/modules Removed /var/lib/puppetlabs/puppet/modules/ssh (v1\.0\.0)
 .
 .P
 Uninstall a module from a specific environment:
diff -Nurp puppet-4.2.1.orig/spec/unit/provider/package/puppet_gem_spec.rb puppet-4.2.1/spec/unit/provider/package/puppet_gem_spec.rb
--- puppet-4.2.1.orig/spec/unit/provider/package/puppet_gem_spec.rb	2015-07-21 20:09:09.000000000 +0300
+++ puppet-4.2.1/spec/unit/provider/package/puppet_gem_spec.rb	2018-04-07 01:07:25.627833693 +0300
@@ -20,7 +20,7 @@ describe provider_class do
   if Puppet.features.microsoft_windows?
     let(:puppet_gem) { 'gem' }
   else
-    let(:puppet_gem) { '/opt/puppetlabs/puppet/bin/gem' }
+    let(:puppet_gem) { '/var/lib/puppetlabs/puppet/bin/gem' }
   end
 
   before :each do
diff -Nurp puppet-4.2.1.orig/spec/unit/util/run_mode_spec.rb puppet-4.2.1/spec/unit/util/run_mode_spec.rb
--- puppet-4.2.1.orig/spec/unit/util/run_mode_spec.rb	2015-07-21 20:09:09.000000000 +0300
+++ puppet-4.2.1/spec/unit/util/run_mode_spec.rb	2018-04-07 01:07:25.527834633 +0300
@@ -67,8 +67,8 @@ describe Puppet::Util::RunMode do
     end
 
     describe "#var_dir" do
-      it "has vardir /opt/puppetlabs/puppet/cache when run as root" do
-        as_root { expect(@run_mode.var_dir).to eq(File.expand_path('/opt/puppetlabs/puppet/cache')) }
+      it "has vardir /var/lib/puppetlabs/puppet/cache when run as root" do
+        as_root { expect(@run_mode.var_dir).to eq(File.expand_path('/var/lib/puppetlabs/puppet/cache')) }
       end
 
       it "has vardir ~/.puppetlabs/opt/puppet/cache when run as non-root" do

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional