puppet 5.3.7 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a89923499069bb0d0ebffd3adfc7454c6c87a26
-  data.tar.gz: 61aecec7d0f54c192990f44a690c70406c9a78d5
+  metadata.gz: bbcab5f5cb4399541643f5eed9ca003120fb707b
+  data.tar.gz: fe7a7969462ef7ad3d248565e3e82b0832575a69
 SHA512:
-  metadata.gz: 84514f060de77aa28cd938719358857343ced288425f384e8692344574bc1af16790f0861b3e4209872eb7165ba39869038f683a47b0574dbd30bf4d5c86d8e3
-  data.tar.gz: 901d30f458df772d33b4a22a557729b6bb14a6042a24942d7c68563c5fac9d9ccf8f869434ec7efd809674082b0a44340d1f498422f2e9c1d5f7c47baf573f3d
+  metadata.gz: 59d5e430fcd6c54af6edcf3ea9118b1ed06ac993556b1a203be500a1448667f838479e7c614375033dbbf0eef986ce02cc89df1779c9834e80422657e9889bd8
+  data.tar.gz: 0ae09468a1d6783a3a4932d318319ecfbf651816c30c451edaa2f7c5175c1beea514a50b45832d488f95877d56099eb38bb370730248ebcb169f243a3ebfafb2

data/CONTRIBUTING.md

@@ -27,13 +27,13 @@ the [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev
 
 ## Getting Started
 
-* Make sure you have a [Jira account](https://tickets.puppetlabs.com)
-* Make sure you have a [GitHub account](https://github.com/signup/free)
+* Make sure you have a [Jira account](https://tickets.puppetlabs.com).
+* Make sure you have a [GitHub account](https://github.com/signup/free).
 * Submit a Jira ticket for your issue if one does not already exist.
-  * Clearly describe the issue including steps to reproduce when it is a bug
+  * Clearly describe the issue including steps to reproduce when it is a bug.
   * Make sure you fill in the earliest version that you know has the issue.
   * A ticket is not necessary for [trivial changes](https://docs.puppet.com/community/trivial_patch_exemption.html)
-* Fork the repository on GitHub
+* Fork the repository on GitHub.
 
 ## Making Changes
 
@@ -41,27 +41,29 @@ the [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev
   * This is usually the master branch.
   * Only target release branches if you are certain your fix must be on that
     branch.
-  * To quickly create a topic branch based on master; `git checkout -b
+  * To quickly create a topic branch based on master, run `git checkout -b
     fix/master/my_contribution master`. Please avoid working directly on the
     `master` branch.
 * Make commits of logical and atomic units.
 * Check for unnecessary whitespace with `git diff --check` before committing.
-* Make sure your commit messages are in the proper format.
-
-````
-    (PUP-1234) Make the example in CONTRIBUTING imperative and concrete
-
-    Without this patch applied the example commit message in the CONTRIBUTING
-    document is not a concrete example.  This is a problem because the
-    contributor is left to imagine what the commit message should look like
-    based on a description rather than an example.  This patch fixes the
-    problem by making the example concrete and imperative.
-
-    The first line is a real life imperative statement with a ticket number
-    from our issue tracker.  The body describes the behavior without the patch,
-    why this is a problem, and how the patch fixes the problem when applied.
-````
-
+* Make sure your commit messages are in the proper format. If the commit
+  addresses an issue filed in the
+  [Puppet Jira project](https://tickets.puppetlabs.com/browse/PUP), start
+  the first line of the commit with the issue number in parentheses.
+
+  ```
+      (PUP-1234) Make the example in CONTRIBUTING imperative and concrete
+
+      Without this patch applied the example commit message in the CONTRIBUTING
+      document is not a concrete example. This is a problem because the
+      contributor is left to imagine what the commit message should look like
+      based on a description rather than an example. This patch fixes the
+      problem by making the example concrete and imperative.
+
+      The first line is a real-life imperative statement with a ticket number
+      from our issue tracker. The body describes the behavior without the patch,
+      why this is a problem, and how the patch fixes the problem when applied.
+  ```
 * Make sure you have added the necessary tests for your changes.
 * Run _all_ the tests to assure nothing else was accidentally broken. First
   install all the test dependencies with `bundle install --path .bundle`. Then
@@ -77,9 +79,10 @@ wrapped in the `_()` translation function, so they can be extracted into files
 for the translators.
 
 When adding user-facing strings to your work, follow these guidelines:
+
 * Use full sentences. Strings built up out of concatenated bits are hard to translate.
 * Use string formatting instead of interpolation. Use the hash format and give good names to the placeholder values that can be used by translators to understand the meaning of the formatted values.
-    Ex. `_('Creating new user %{name}.') % { name: user.name }`
+  For example: `_('Creating new user %{name}.') % { name: user.name }`
 * Use `n_()` for pluralization. (see gettext gem docs linked above for details)
 
 It is the responsibility of contributors and code reviewers to ensure that all
@@ -92,25 +95,33 @@ ticket in Jira. In this case, it is appropriate to start the first line of a
 commit with one of  `(docs)`, `(maint)`, or `(packaging)` instead of a ticket
 number.
 
-````
-    (docs) Add documentation commit example to CONTRIBUTING
+If a Jira ticket exists for the documentation commit, you can include it
+after the `(docs)` token.
+
+```
+    (docs)(DOCUMENT-000) Add docs commit example to CONTRIBUTING
 
     There is no example for contributing a documentation commit
     to the Puppet repository. This is a problem because the contributor
     is left to assume how a commit of this nature may appear.
 
-    The first line is a real life imperative statement with '(doc)' in
-    place of what would have been the ticket number in a
+    The first line is a real-life imperative statement with '(docs)' in
+    place of what would have been the PUP project ticket number in a
     non-documentation related commit. The body describes the nature of
     the new documentation or comments added.
-````
+```
+
+For commits that address trivial repository maintenance tasks or packaging
+issues, start the first line of the commit with `(maint)` or `(packaging)`,
+respectively.
 
 ## Submitting Changes
 
 * Sign the [Contributor License Agreement](http://links.puppet.com/cla).
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request to the repository in the puppetlabs organization.
-* Update your Jira ticket to mark that you have submitted code and are ready for it to be reviewed (Status: Ready for Merge).
+* Update your Jira ticket to mark that you have submitted code and are ready
+  for it to be reviewed (Status: Ready for Merge).
   * Include a link to the pull request in the ticket.
 * The core team looks at Pull Requests on a regular basis in a weekly triage
   meeting that we hold in a public Google Hangout. The hangout is announced in
@@ -122,6 +133,7 @@ number.
   weeks we may close the pull request if it isn't showing any activity.
 
 ## Revert Policy
+
 By running tests in advance and by engaging with peer review for prospective
 changes, your contributions have a high probability of becoming long lived
 parts of the the project. After being merged, the code will run through a
@@ -142,10 +154,11 @@ ticket. This test(s) should be used to check future submissions of the code to
 ensure the issue has been resolved.
 
 ### Summary
+
 * Changes resulting in test pipeline failures will be reverted if they cannot
   be resolved within one business day.
 
-# Additional Resources
+## Additional Resources
 
 * [Puppet community guidelines](https://docs.puppet.com/community/community_guidelines.html)
 * [Bug tracker (Jira)](https://tickets.puppetlabs.com)

data/README.md

@@ -1,8 +1,10 @@
 Puppet
 ======
 
-[![Build Status](https://travis-ci.org/puppetlabs/puppet.png?branch=master)](https://travis-ci.org/puppetlabs/puppet)
-[![Inline docs](https://inch-ci.org/github/puppetlabs/puppet.png)](https://inch-ci.org/github/puppetlabs/puppet)
+[![Travis Status](https://travis-ci.org/puppetlabs/puppet.svg?branch=master)](https://travis-ci.org/puppetlabs/puppet)
+[![Appveyor Status](https://ci.appveyor.com/api/projects/status/cvhpypd4504sevqq/branch/master?svg=true)](https://ci.appveyor.com/project/puppetlabs/puppet/branch/master)
+[![Gem Version](https://badge.fury.io/rb/puppet.svg)](https://badge.fury.io/rb/puppet)
+[![Inline docs](https://inch-ci.org/github/puppetlabs/puppet.svg)](https://inch-ci.org/github/puppetlabs/puppet)
 
 Puppet, an automated administrative engine for your Linux, Unix, and Windows systems, performs
 administrative tasks (such as adding users, installing packages, and updating server
@@ -16,7 +18,7 @@ Documentation for Puppet and related projects can be found online at the
 
 HTTP API
 --------
-[HTTP API Index](https://puppet.com/docs/puppet/5.3/http_api/http_api_index.html)
+[HTTP API Index](https://puppet.com/docs/puppet/5.4/http_api/http_api_index.html)
 
 Installation
 ------------
@@ -26,7 +28,7 @@ which also includes orchestration features, a web console, and professional supp
 [The PE documentation is available here.](https://puppet.com/docs/pe/latest)
 
 To install an open source release of Puppet,
-[see the installation guide on the docs site.](http://puppet.com/docs/puppet/5.3/install_pre.html)
+[see the installation guide on the docs site.](http://puppet.com/docs/puppet/5.4/install_pre.html)
 
 If you need to run Puppet from source as a tester or developer,
 [see the running from source guide on the docs site.](https://docs.puppet.com/puppet/3.8/from_source.html)
@@ -53,10 +55,10 @@ Support
 
 Please log tickets and issues at our [JIRA tracker](https://tickets.puppetlabs.com).  A [mailing
 list](https://groups.google.com/forum/?fromgroups#!forum/puppet-users) is
-available for asking questions and getting help from others. In addition there
+available for asking questions and getting help from others. In addition, there
 is an active #puppet channel on Freenode.
 
-We use semantic version numbers for our releases, and recommend that users stay
+We use semantic version numbers for our releases and recommend that users stay
 as up-to-date as possible by upgrading to patch releases and minor releases as
 they become available.
 

data/ext/cert_inspector

@@ -97,7 +97,7 @@ class X509Collector
         next unless public_key_info = extract_public_key_info(path, meaning)
         public_key, priority, name = public_key_info
         pem = public_key.to_s
-        existing_priority, existing_name, existing_public_key = key_data[pem]
+        existing_priority, _, _ = key_data[pem]
         next if existing_priority and existing_priority < priority
         key_data[pem] = priority, name, public_key
       rescue
@@ -106,7 +106,7 @@ class X509Collector
     end
     name_to_key_hash = {}
     key_data.each do |pem, data|
-      priority, name, public_key = data
+      _, name, public_key = data
       if name_to_key_hash[name]
         suffix_num = 2
         while name_to_key_hash[name + " (#{suffix_num})"]

data/ext/envpuppet

@@ -48,7 +48,7 @@ will taint the development version
 
 The following enviornment variables configure the behavior of envpuppet
 
-    ENVPUPPET_BASEDIR=${HOME}/src 
+    ENVPUPPET_BASEDIR="${HOME}/src"
       the base directory where puppet, facter, etc...  live.
 
     ENVPUPPET_BLEEDING=true   Enables bleeding edge prototypes like

data/ext/gentoo/init.d/puppetmaster

@@ -36,7 +36,7 @@ start() {
     ebegin "Starting puppetmaster"
     start-stop-daemon --start --quiet --exec /usr/bin/ruby /usr/bin/puppetmasterd \
         -- ${options}
-    eend $? "Failed to start puppetmaster"
+    eend "$?" "Failed to start puppetmaster"
 }
 
 stop() {
@@ -44,8 +44,8 @@ stop() {
     start-stop-daemon --stop --quiet \
         --pidfile ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
     local ret=$?
-    eend ${ret} "Failed to stop puppetmaster"
-    rm -f ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
-    return ${ret}
+    eend "${ret}" "Failed to stop puppetmaster"
+    rm -f "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid"
+    return "${ret}"
 }
 

data/ext/ips/puppet-agent

@@ -2,16 +2,16 @@
 
 . /lib/svc/share/smf_include.sh
 
-[[ -z "${SMF_FMRI}" ]] && exit $SMF_EXIT_ERR
+[[ -z "${SMF_FMRI}" ]] && exit "$SMF_EXIT_ERR"
 
 typeset -r CONF_FILE=/etc/puppet/puppet.conf
-[[ ! -f "${CONF_FILE}" ]] && exit $SMF_EXIT_ERR_CONFIG
+[[ ! -f "${CONF_FILE}" ]] && exit "$SMF_EXIT_ERR_CONFIG"
 
 typeset -r PUPPET=/usr/bin/puppet
 
 case "$1" in
 start)
-  exec $PUPPET agent
+  exec "$PUPPET" agent
   ;;
 
 stop)
@@ -23,22 +23,22 @@ stop)
   # continues until all processes are killed.
   # svcs -p <fmri> lists all processes in the contract.
   # http://bnsmb.de/solaris/My_Little_SMF_FAQ.html
-  ctid=`svcprop -p restarter/contract $SMF_FMRI`
+  ctid=`svcprop -p restarter/contract "$SMF_FMRI"`
   if [ -n "$ctid" ]; then
-    smf_kill_contract $ctid TERM 1 5
+    smf_kill_contract "$ctid" TERM 1 5
     ret=$?
-    [ $ret -eq 1 ] && exit $SMF_EXIT_ERR_FATAL
+    [ "$ret" -eq 1 ] && exit "$SMF_EXIT_ERR_FATAL"
 
-    if [ $ret -eq 2 ] ; then
-      smf_kill_contract $ctid KILL 1
-      [ $? -ne 0 ] && exit $SMF_EXIT_ERR_FATAL
+    if [ "$ret" -eq 2 ] ; then
+      smf_kill_contract "$ctid" KILL 1
+      [ $? -ne 0 ] && exit "$SMF_EXIT_ERR_FATAL"
     fi
   fi
   ;;
 *)
   echo "Usage: $0 {start|stop}";
-  exit $SMF_EXIT_ERR_FATAL
+  exit "$SMF_EXIT_ERR_FATAL"
   ;;
 esac
-exit $SMF_EXIT_OK
+exit "$SMF_EXIT_OK"
 

data/ext/ips/puppet-master

@@ -2,15 +2,15 @@
 
 . /lib/svc/share/smf_include.sh
 
-[[ -z "${SMF_FMRI}" ]] && exit $SMF_EXIT_ERR
+[[ -z "${SMF_FMRI}" ]] && exit "$SMF_EXIT_ERR"
 
 typeset -r CONF_FILE=/etc/puppet/puppet.conf
-[[ ! -f ${CONF_FILE} ]] && exit $SMF_EXIT_ERR_CONFIG
+[[ ! -f "${CONF_FILE}" ]] && exit "$SMF_EXIT_ERR_CONFIG"
 typeset -r PUPPET=/usr/bin/puppet
 
 case "$1" in
 start)
-  exec $PUPPET master --daemonize
+  exec "$PUPPET" master --daemonize
   ;;
 
 stop)
@@ -23,22 +23,22 @@ stop)
   # svcs -p <fmri> lists all processes in the contract.
   # http://bnsmb.de/solaris/My_Little_SMF_FAQ.html
 
-  ctid=`svcprop -p restarter/contract $SMF_FMRI`
+  ctid=`svcprop -p restarter/contract "$SMF_FMRI"`
   if [ -n "$ctid" ]; then
-    smf_kill_contract $ctid TERM 1 5
+    smf_kill_contract "$ctid" TERM 1 5
     ret=$?
-    [ $ret -eq 1 ] && exit $SMF_EXIT_ERR_FATAL
+    [ "$ret" -eq 1 ] && exit "$SMF_EXIT_ERR_FATAL"
 
-    if [ $ret -eq 2 ] ; then
-      smf_kill_contract $ctid KILL 1
-      [ $? -ne 0 ] && exit $SMF_EXIT_ERR_FATAL
+    if [ "$ret" -eq 2 ] ; then
+      smf_kill_contract "$ctid" KILL 1
+      [ $? -ne 0 ] && exit "$SMF_EXIT_ERR_FATAL"
     fi
   fi
   ;;
 *)
   echo "Usage: $0 {start|stop}";
-  exit $SMF_EXIT_ERR_FATAL
+  exit "$SMF_EXIT_ERR_FATAL"
   ;;
 esac
-exit $SMF_EXIT_OK
+exit "$SMF_EXIT_OK"
 

data/ext/puppet-test

@@ -382,7 +382,6 @@ $args = {}
 $options = {:repeat => 1, :fork => 0, :pause => false, :nodes => []}
 
 begin
-    explicit_waitforcert = false
     result.each { |opt,arg|
         case opt
             # First check to see if the argument is a valid setting;
@@ -397,7 +396,7 @@ begin
             when "--fork"
                 begin
                     $options[:fork] = Integer(arg)
-                rescue => detail
+                rescue
                     $stderr.puts "The argument to 'fork' must be an integer"
                     exit(14)
                 end

data/ext/redhat/client.init

@@ -16,9 +16,9 @@
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
 lockfile=/var/lock/subsys/puppet
 piddir=/var/run/puppetlabs
-pidfile=${piddir}/agent.pid
+pidfile="${piddir}/agent.pid"
 puppetd=/opt/puppetlabs/puppet/bin/puppet
-pid=$(cat $pidfile 2> /dev/null)
+pid=$(cat "$pidfile" 2> /dev/null)
 RETVAL=0
 
 PUPPET_OPTS="agent "

data/ext/redhat/logrotate

@@ -15,7 +15,7 @@
   nocreate
   sharedscripts
   postrotate
-   ([ -x /etc/init.d/puppet ] && /etc/init.d/puppet reload > /dev/null 2>&1) ||
+   ([ -x /etc/init.d/puppet ] && /etc/init.d/puppet rotate > /dev/null 2>&1) ||
     ([ -x /usr/bin/systemctl ] && /usr/bin/systemctl kill -s USR2 puppet.service > /dev/null 2>&1) || true
   endscript
 }

data/ext/solaris/smf/puppet

@@ -2,16 +2,16 @@
 
 . /lib/svc/share/smf_include.sh
 
-[ -z "${SMF_FMRI}" ] && exit $SMF_EXIT_ERR
+[ -z "${SMF_FMRI}" ] && exit "$SMF_EXIT_ERR"
 
 CONF_FILE=/etc/puppetlabs/puppet/puppet.conf
-[ ! -f "${CONF_FILE}" ] && exit $SMF_EXIT_ERR_CONFIG
+[ ! -f "${CONF_FILE}" ] && exit "$SMF_EXIT_ERR_CONFIG"
 
 PUPPET=/opt/puppetlabs/bin/puppet
 
 case "$1" in
 start)
-  exec $PUPPET agent
+  exec "$PUPPET" agent
   ;;
 
 stop)
@@ -23,22 +23,22 @@ stop)
   # continues until all processes are killed.
   # svcs -p <fmri> lists all processes in the contract.
   # http://bnsmb.de/solaris/My_Little_SMF_FAQ.html
-  ctid=`svcprop -p restarter/contract $SMF_FMRI`
+  ctid=`svcprop -p restarter/contract "$SMF_FMRI"`
   if [ -n "$ctid" ]; then
-    smf_kill_contract $ctid TERM 1 30
+    smf_kill_contract "$ctid" TERM 1 30
     ret=$?
-    [ $ret -eq 1 ] && exit $SMF_EXIT_ERR_FATAL
+    [ "$ret" -eq 1 ] && exit "$SMF_EXIT_ERR_FATAL"
 
-    if [ $ret -eq 2 ] ; then
-      smf_kill_contract $ctid KILL 1
-      [ $? -ne 0 ] && exit $SMF_EXIT_ERR_FATAL
+    if [ "$ret" -eq 2 ] ; then
+      smf_kill_contract "$ctid" KILL 1
+      [ $? -ne 0 ] && exit "$SMF_EXIT_ERR_FATAL"
     fi
   fi
   ;;
 *)
   echo "Usage: $0 {start|stop}";
-  exit $SMF_EXIT_ERR_FATAL
+  exit "$SMF_EXIT_ERR_FATAL"
   ;;
 esac
-exit $SMF_EXIT_OK
+exit "$SMF_EXIT_OK"
 

data/ext/solaris/smf/svc-puppetd

@@ -28,14 +28,14 @@ start)
     ;;
 stop)
     printf "Stopping Puppet client services:"
-    kill `cat $pidfile`
+    kill `cat "$pidfile"`
 
     printf " puppetd"
     echo ""
     ;;
 restart)
     printf "Restarting Puppet client services:"
-    kill -HUP `cat $pidfile`
+    kill -HUP `cat "$pidfile"`
 
     printf " puppetd"
     echo ""
@@ -43,14 +43,14 @@ restart)
 reload)
     printf "Reloading Puppet client services:"
 
-    kill -HUP `cat $pidfile`
+    kill -HUP `cat "$pidfile"`
 
     printf " puppetd"
     echo ""
     ;;
 status)
-    if [ -f $pidfile ]; then
-        pid=`cat $pidfile`
+    if [ -f "$pidfile" ]; then
+        pid=`cat "$pidfile"`
         curpid=`pgrep puppetd`
         if [ "$pid" -eq "$curpid" ]; then
             exit 0