puppet 4.0.0 → 4.9.1

data/ext/osx/puppet.plist

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>EnvironmentVariables</key>
+        <dict>
+                <key>LANG</key>
+                <string>en_US.UTF-8</string>
+        </dict>
+        <key>Label</key>
+        <string>puppet</string>
+        <key>KeepAlive</key>
+        <true/>
+        <key>ProgramArguments</key>
+        <array>
+                <string>/opt/puppetlabs/bin/puppet</string>
+                <string>agent</string>
+                <string>--verbose</string>
+                <string>--no-daemonize</string>
+                <string>--logdest</string>
+                <string>console</string>
+        </array>
+        <key>RunAtLoad</key>
+        <true/>
+        <key>StandardErrorPath</key>
+        <string>/var/log/puppetlabs/puppet/puppet.log</string>
+        <key>StandardOutPath</key>
+        <string>/var/log/puppetlabs/puppet/puppet.log</string>
+</dict>
+</plist>

data/ext/project_data.yaml

@@ -9,15 +9,21 @@ version_file: 'lib/puppet/version.rb'
 # files and gem_files are space separated lists
 files: '[A-Z]* install.rb bin lib conf man examples ext tasks spec'
 # The gem specification bits only work on Puppet >= 3.0rc, NOT 2.7.x and earlier
-gem_files: '[A-Z]* install.rb bin lib conf man examples ext tasks spec'
+gem_files: '[A-Z]* install.rb bin lib conf man examples ext tasks spec locales'
 gem_test_files: 'spec/**/*'
 gem_executables: 'puppet'
 gem_default_executables: 'puppet'
 gem_forge_project: 'puppet'
+gem_required_ruby_version: '>= 1.9.3'
+gem_required_rubygems_version: '> 1.3.1'
 gem_runtime_dependencies:
   facter: ['> 2.0', '< 4']
-  hiera: ['>= 2.0', '< 3']
-  json_pure:
+  hiera: ['>= 2.0', '< 4']
+  json_pure: '~> 1.8'
+  # PUP-7115 - return to a gem dependency in Puppet 5
+  # semantic_puppet: ['>= 0.1.3', '< 2']
+  gettext-setup: ['>= 0.10', '< 1']
+  locale: '~> 2.1'
 gem_rdoc_options:
   - --title
   - "Puppet - Configuration Management"
@@ -25,25 +31,35 @@ gem_rdoc_options:
   - README.md
   - --line-numbers
 gem_platform_dependencies:
+  universal-darwin:
+    gem_runtime_dependencies:
+      CFPropertyList: '~> 2.2.6'
   x86-mingw32:
     gem_runtime_dependencies:
       # Pinning versions that require native extensions
       ffi: '~> 1.9.6'
-      win32-dir: '~> 0.4.9'
-      win32-eventlog: '~> 0.6.2'
-      win32-process: '~> 0.7.4'
-      win32-security: '~> 0.2.5'
-      win32-service: '~> 0.8.6'
+      # win32-xxxx gems are pinned due to PUP-6445
+      win32-dir: '= 0.4.9'
+      win32-eventlog: '= 0.6.5'
+      win32-process: '= 0.7.5'
+      # Use of win32-security is deprecated
+      win32-security: '= 0.2.5'
+      win32-service: '= 0.8.8'
       minitar: '~> 0.5.4'
   x64-mingw32:
     gem_runtime_dependencies:
       ffi: '~> 1.9.6'
-      win32-dir: '~> 0.4.9'
-      win32-eventlog: '~> 0.6.2'
-      win32-process: '~> 0.7.4'
-      win32-security: '~> 0.2.5'
-      win32-service: '~> 0.8.6'
+      # win32-xxxx gems are pinned due to PUP-6445
+      win32-dir: '= 0.4.9'
+      win32-eventlog: '= 0.6.5'
+      win32-process: '= 0.7.5'
+      # Use of win32-security is deprecated
+      win32-security: '= 0.2.5'
+      win32-service: '= 0.8.8'
       minitar: '~> 0.5.4'
 bundle_platforms:
+  universal-darwin: all
   x86-mingw32: mingw
   x64-mingw32: x64_mingw
+pre_tasks:
+  'package:apple': 'cfpropertylist'

data/ext/puppet-test

@@ -23,8 +23,8 @@
 # parameter, so you can specify '--server <servername>' as an argument.
 #
 # See the configuration file documentation at
-# http://reductivelabs.com/projects/puppet/reference/configref.html for
-# the full list of acceptable parameters. A commented list of all
+# http://docs.puppetlabs.com/puppet/latest/reference/config_about_settings.html
+# for the full list of acceptable parameters. A commented list of all
 # configuration $options can also be generated by running puppetd with
 # '--genconfig'.
 #
@@ -91,7 +91,7 @@
 #   you may not use this file except in compliance with the License.
 #   You may obtain a copy of the License at
 #
-#       http://www.apache.org/licenses/LICENSE-2.0
+#       https://www.apache.org/licenses/LICENSE-2.0
 #
 #   Unless required by applicable law or agreed to in writing, software
 #   distributed under the License is distributed on an "AS IS" BASIS,

data/ext/rack/example-passenger-vhost.conf

@@ -1,6 +1,6 @@
 # This Apache 2 virtual host config shows how to use Puppet as a Rack
 # application via Passenger. See
-# http://docs.puppetlabs.com/guides/passenger.html for more information.
+# https://docs.puppetlabs.com/guides/passenger.html for more information.
 
 # You can also use the included config.ru file to run Puppet with other Rack
 # servers instead of Passenger.

data/ext/redhat/client.init

@@ -13,25 +13,22 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-PATH=/opt/puppetlabs/puppet/bin:/usr/bin:/sbin:/bin:/usr/sbin
-export PATH
-
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
-lockfile=${LOCKFILE-/var/lock/subsys/puppet}
-pidfile=${PIDFILE-/var/run/puppetlabs/agent.pid}
-puppetd=${PUPPETD-/opt/puppetlabs/puppet/bin/puppet}
+lockfile=/var/lock/subsys/puppet
+piddir=/var/run/puppetlabs
+pidfile=${piddir}/agent.pid
+puppetd=/opt/puppetlabs/puppet/bin/puppet
+pid=$(cat $pidfile 2> /dev/null)
 RETVAL=0
 
 PUPPET_OPTS="agent "
-[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="${PUPPET_OPTS} --server=${PUPPET_SERVER}"
-[ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
-[ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --masterport=${PUPPET_PORT}"
 
 # Determine if we can use the -p option to daemon, killproc, and status.
 # RHEL < 5 can't.
 if status | grep -q -- '-p' 2>/dev/null; then
     daemonopts="--pidfile $pidfile"
     pidopts="-p $pidfile"
+    USEINITFUNCTIONS=true
 fi
 
 # Figure out if the system just booted. Let's assume
@@ -41,6 +38,7 @@ fi
 
 start() {
     echo -n $"Starting puppet agent: "
+    mkdir -p $piddir
     daemon $daemonopts $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS}
     RETVAL=$?
     echo
@@ -50,15 +48,40 @@ start() {
 
 stop() {
     echo -n $"Stopping puppet agent: "
-    killproc $pidopts $puppetd
-    RETVAL=$?
+    if [ "$USEINITFUNCTIONS" = "true" ]; then
+      killproc $pidopts $puppetd
+      RETVAL=$?
+    else
+      if [ -n "${pid}" ]; then
+        kill -TERM $pid >/dev/null 2>&1
+        RETVAL=$?
+      fi
+    fi
     echo
     [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+    return $RETVAL
 }
 
 reload() {
-    echo -n $"Restarting puppet agent: "
-    killproc $pidopts $puppetd -HUP
+    echo -n $"Reloading puppet agent: "
+    if [ "$USEINITFUNCTIONS" = "true" ]; then
+      killproc $pidopts $puppetd -HUP
+      RETVAL=$?
+    else
+      if [ -n "${pid}" ]; then
+        kill -HUP $pid >/dev/null 2>&1
+        RETVAL=$?
+      else
+        RETVAL=0
+      fi
+    fi
+    echo
+    return $RETVAL
+}
+
+rotate() {
+    echo -n $"Reopening log files for puppet agent: "
+    killproc $pidopts $puppetd -USR2
     RETVAL=$?
     echo
     return $RETVAL
@@ -70,9 +93,33 @@ restart() {
 }
 
 rh_status() {
-    status $pidopts $puppetd
-    RETVAL=$?
-    return $RETVAL
+    base=puppet
+    if [ "$USEINITFUNCTIONS" = "true" ]; then
+      status $pidopts $puppetd
+      RETVAL=$?
+      return $RETVAL
+    else
+      if [ -n "${pid}" ]; then
+        if `ps -p $pid | grep $pid > /dev/null 2>&1`; then
+          echo "${base} (pid ${pid}) is running..."
+          RETVAL=0
+          return $RETVAL
+        fi
+      fi
+      if [ -f "${pidfile}" ] ; then
+        echo "${base} dead but pid file exists"
+        RETVAL=1
+        return $RETVAL
+      fi
+      if [ -f "${lockfile}" ]; then
+        echo "${base} dead but subsys locked"
+        RETVAL=2
+        return $RETVAL
+      fi
+      echo "${base} is stopped"
+      RETVAL=3
+      return $RETVAL
+    fi
 }
 
 rh_status_q() {
@@ -94,6 +141,9 @@ case "$1" in
     restart)
         restart
     ;;
+    rotate)
+        rotate
+    ;;
     reload|force-reload)
         reload
     ;;
@@ -112,7 +162,7 @@ case "$1" in
         genconfig
     ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|once|genconfig}"
+        echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart|rotate|once|genconfig}"
         exit 1
 esac
 

data/ext/redhat/client.sysconfig

@@ -1,11 +1,2 @@
-# The puppetmaster server
-#PUPPET_SERVER=puppet
-
-# If you wish to specify the port to connect to do so here
-#PUPPET_PORT=8140
-
-# Where to log to. Specify syslog to send log messages to the system log.
-#PUPPET_LOG=/var/log/puppetlabs/puppet/puppet.log
-
-# You may specify other parameters to the puppet client here
+# You may specify parameters to the puppet client here
 #PUPPET_EXTRA_OPTS=--waitforcert=500

data/ext/redhat/logrotate

@@ -1,9 +1,21 @@
-/var/log/puppetlabs/puppet.log {
+# Generic logrotate config for Red Hat systems. Works with both official
+# Fedora and RHEL packages as well as PuppetLabs distributions.
+
+/var/log/puppetlabs/masterhttp.log /var/log/puppet/masterhttp.log {
+  compress
   missingok
   notifempty
-  create 0644 puppet puppet
+  nocreate
+}
+
+/var/log/puppetlabs/puppetd.log /var/log/puppet/puppetd.log {
+  compress
+  missingok
+  notifempty
+  nocreate
   sharedscripts
   postrotate
-    [ -e /etc/init.d/puppet ] && /etc/init.d/puppet reload > /dev/null 2>&1 || true
+   ([ -x /etc/init.d/puppet ] && /etc/init.d/puppet reload > /dev/null 2>&1) ||
+    ([ -x /usr/bin/systemctl ] && /usr/bin/systemctl kill -s USR2 puppet.service > /dev/null 2>&1) || true
   endscript
 }

data/ext/redhat/puppet.spec.erb

@@ -29,8 +29,8 @@ Release:        <%= @rpmrelease -%>%{?dist}
 Vendor:         %{?_host_vendor}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
-URL:            http://puppetlabs.com
-Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{realversion}.tar.gz
+URL:            https://puppetlabs.com
+Source0:        https://puppetlabs.com/downloads/%{name}/%{name}-%{realversion}.tar.gz
 
 Group:          System Environment/Base
 
@@ -181,12 +181,9 @@ echo "D /var/run/%{name} 0755 %{name} %{name} -" > \
 # Create puppet modules directory for puppet module tool
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules
 
-
-# Install a NetworkManager dispatcher script to pickup changes to
-# # /etc/resolv.conf and such (https://bugzilla.redhat.com/532085).
-mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d
-cp -pr ext/puppet-nm-dispatcher \
-  %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/98-%{name}
+# Masterhttp.log is created on server start and should be distributed
+# with correct permissions
+touch %{buildroot}%{_localstatedir}/log/puppet/masterhttp.log
 
 %files
 %defattr(-, root, root, 0755)
@@ -194,9 +191,6 @@ cp -pr ext/puppet-nm-dispatcher \
 %{_bindir}/puppet
 %{_bindir}/extlookup2hiera
 %{puppet_libdir}/*
-%dir %{_sysconfdir}/NetworkManager
-%dir %{_sysconfdir}/NetworkManager/dispatcher.d
-%{_sysconfdir}/NetworkManager/dispatcher.d/98-puppet
 %if 0%{?_with_systemd}
 %{_unitdir}/puppet.service
 %{_unitdir}/puppetagent.service
@@ -280,6 +274,7 @@ cp -pr ext/puppet-nm-dispatcher \
 %{_sysconfdir}/puppet/environments/example_env/README.environment
 %{_mandir}/man8/puppet-ca.8.gz
 %{_mandir}/man8/puppet-master.8.gz
+%attr(660, puppet, puppet) %{_localstatedir}/log/puppet/masterhttp.log
 
 # Fixed uid/gid were assigned in bz 472073 (Fedora), 471918 (RHEL-5),
 # and 471919 (RHEL-4)

data/ext/redhat/server.init

@@ -89,7 +89,7 @@ genconfig() {
 }
 
 rh_status() {
-    status $pidopts $PUPPETMASTER
+    status $pidopts -l $lockfile $PUPPETMASTER
     RETVAL=$?
     return $RETVAL
 }

data/ext/regexp_nodes/regexp_nodes.rb

@@ -2,7 +2,7 @@
 
 # = Synopsis
 # This is an external node classifier script, after
-# http://docs.puppetlabs.com/guides/external_nodes.html
+# https://docs.puppetlabs.com/guides/external_nodes.html
 #
 # = Usage
 # regexp_nodes.rb <host>

data/ext/solaris/pkginfo

@@ -2,5 +2,5 @@ PKG=CSWpuppet
 NAME=puppet - System Automation Framework
 VERSION=3.0.0
 CATEGORY=application
-VENDOR=http://projects.puppetlabs.com/projects/puppet
+VENDOR=https://projects.puppetlabs.com/projects/puppet
 EMAIL=info@puppetlabs.com

data/ext/solaris/smf/puppet

@@ -0,0 +1,44 @@
+#!/sbin/sh
+
+. /lib/svc/share/smf_include.sh
+
+[ -z "${SMF_FMRI}" ] && exit $SMF_EXIT_ERR
+
+CONF_FILE=/etc/puppetlabs/puppet/puppet.conf
+[ ! -f "${CONF_FILE}" ] && exit $SMF_EXIT_ERR_CONFIG
+
+PUPPET=/opt/puppetlabs/bin/puppet
+
+case "$1" in
+start)
+  exec $PUPPET agent
+  ;;
+
+stop)
+  # stop sends sigterm first followed by sigkill
+  # smf_kill_contract <CTID> TERM 1 30
+  # sends sigterm to all process in ctid and will continue
+  # to do so for 30 seconds with interval of 5 seconds
+  # smf_kill_contract <CTID> KILL 1
+  # 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`
+  if [ -n "$ctid" ]; then
+    smf_kill_contract $ctid TERM 1 30
+    ret=$?
+    [ $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
+    fi
+  fi
+  ;;
+*)
+  echo "Usage: $0 {start|stop}";
+  exit $SMF_EXIT_ERR_FATAL
+  ;;
+esac
+exit $SMF_EXIT_OK
+

data/ext/solaris/smf/puppet.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<!-- Original puppet manifest: Luke Kanies - puppetlabs.com -->
+<service_bundle type="manifest" name="puppet">
+
+  <service name="network/puppet" type="service" version="1">
+
+    <create_default_instance enabled="false"/>
+    <single_instance/>
+
+    <dependency name="config-file" grouping="require_all" restart_on="none" type="path">
+      <service_fmri value="file:///etc/puppetlabs/puppet/puppet.conf"/>
+    </dependency>
+
+    <dependency name="loopback" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/network/loopback:default"/>
+    </dependency>
+
+    <dependency name="physical" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/network/physical:default"/>
+    </dependency>
+
+    <dependency name="fs-local" grouping="require_all" restart_on="none" type="service">
+      <service_fmri value="svc:/system/filesystem/local"/>
+    </dependency>
+
+    <exec_method type="method" name="start" exec="/lib/svc/method/puppet start" timeout_seconds="60"/>
+
+    <exec_method type="method" name="stop" exec="/lib/svc/method/puppet stop" timeout_seconds="60"/>
+
+  <stability value="Evolving"/>
+
+    <template>
+      <common_name>
+        <loctext xml:lang="C">Puppet Agent Daemon</loctext>
+      </common_name>
+      <documentation>
+        <manpage title="puppet" section="1"/>
+        <doc_link name="puppetlabs.com" uri="https://puppetlabs.com/puppet/introduction"/>
+      </documentation>
+    </template>
+  </service>
+
+</service_bundle>

data/ext/suse/client.init

@@ -33,15 +33,11 @@
 #      rc_exit          exit appropriate to overall rc status
 [ -f /etc/rc.status ] && . /etc/rc.status
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
-lockfile=${LOCKFILE-/var/lock/subsys/puppet}
-pidfile=${PIDFILE-/var/run/puppetlabs/agent.pid}
-puppetd=${PUPPETD-/usr/bin/puppet}
-RETVAL=0
+lockfile=/var/lock/subsys/puppet
+pidfile=/var/run/puppetlabs/agent.pid
+puppetd=/opt/puppetlabs/puppet/bin/puppet
 
 PUPPET_OPTS="agent"
-[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="${PUPPET_OPTS} --server=${PUPPET_SERVER}"
-[ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
-[ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --port=${PUPPET_PORT}"
 
 # First reset status of this service
 rc_reset
@@ -66,9 +62,18 @@ case "$1" in
         ## Start daemon with startproc(8). If this fails
         ## the echo return value is set appropriate.
 
-        # startproc should return 0, even if service is
-        # already running to match LSB spec.
-        startproc -p ${pidfile} $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} && touch ${lockfile}
+        ## This accounts for the behavior of startproc on sles 10.
+        ## Check to see if a running process matches the contents
+        ## of the pidfile, and do nothing if true. Otherwise
+        ## force a process start
+        if [ -f "${pidfile}" ]; then
+            PID=$(cat "$pidfile")
+            if [ "$PID" -eq $(pgrep -f "$puppetd") ] ; then
+                rc_status -v
+                rc_exit
+            fi
+        fi
+        startproc -f -w -p "${pidfile}" "${puppetd}" "${PUPPET_OPTS}" ${PUPPET_EXTRA_OPTS} && touch "${lockfile}"
         # Remember status and be verbose
         rc_status -v
         ;;
@@ -77,12 +82,12 @@ case "$1" in
         ## Stop daemon with killproc(8) and if this fails
         ## set echo the echo return value.
 
-        killproc -QUIT -p ${pidfile} $puppetd && rm -f ${lockfile} ${pidfile}
+        killproc -QUIT -p "${pidfile}" "${puppetd}" && rm -f "${lockfile}" "${pidfile}"
 
         # Remember status and be verbose
         rc_status -v
         ;;
-    try-restart)
+    try-restart|condrestart)
         ## Stop the service and if this succeeds (i.e. the
         ## service was running before), start it again.
         $0 status >/dev/null &&  $0 restart
@@ -99,23 +104,10 @@ case "$1" in
         # Remember status and be quiet
         rc_status
         ;;
-    force-reload)
-        ## Signal the daemon to reload its config. Most daemons
-        ## do this on signal 1 (SIGHUP).
-        ## If it does not support it, restart.
-
-        echo -n "Reload service puppet"
-        ## if it supports it:
-        killproc -HUP -p ${pidfile} $puppetd
-        rc_status -v
-        ;;
-    reload)
-        ## Like force-reload, but if daemon does not support
-        ## signalling, do nothing (!)
-
-        # If it supports signalling:
-        echo -n "Reload puppet services."
-        killproc -HUP -p ${pidfile} $puppetd
+    reload|force-reload)
+        # Reload the service by sending the HUP signal
+        echo -n "Reloading puppet service: "
+        killproc -HUP -p "${pidfile}" "${puppetd}"
         rc_status -v
         ;;
     status)
@@ -130,15 +122,20 @@ case "$1" in
         # 3 - service not running
 
         # NOTE: checkproc returns LSB compliant status values.
-        checkproc -p ${pidfile} $puppetd
-        rc_status -v
+        if [ -f "${pidfile}" ]; then
+            checkproc -p "${pidfile}" "${puppetd}"
+            rc_status -v
+        else
+            rc_failed 3
+            rc_status -v
+        fi
         ;;
     once)
         shift
-        $puppetd ${PUPPET_OPTS} --onetime ${PUPPET_EXTRA_OPTS} $@
+        $puppetd "${PUPPET_OPTS}" --onetime ${PUPPET_EXTRA_OPTS} $@
         ;;
     *)
-        echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|once}"
+        echo "Usage: $0 {start|stop|status|try-restart|condrestart|restart|force-reload|reload|once}"
         exit 1
 esac
 rc_exit

data/ext/suse/puppet.spec

@@ -9,8 +9,8 @@ Release: 1%{?dist}
 License: Apache 2.0
 Group:    Productivity/Networking/System
 
-URL: http://puppetlabs.com/projects/puppet/
-Source0: http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
+URL: https://puppetlabs.com/projects/puppet/
+Source0: https://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
 
 PreReq: %{insserv_prereq} %{fillup_prereq}
 Requires: ruby >= 1.8.7

data/ext/suse/server.init

@@ -115,7 +115,7 @@ case "$1" in
         # Remember status and be verbose
         rc_status -v
         ;;
-    try-restart)
+    try-restart|condrestart)
         ## Stop the service and if this succeeds (i.e. the
         ## service was running before), start it again.
         $0 status >/dev/null &&  $0 restart
@@ -167,7 +167,7 @@ case "$1" in
         rc_status -v
         ;;
     *)
-        echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
+        echo "Usage: $0 {start|stop|status|try-restart|condrestart|restart|force-reload|reload}"
         exit 1
 esac
 rc_exit

data/ext/systemd/puppet.service

@@ -1,12 +1,24 @@
+#
+# Local settings can be configured without being overwritten by package upgrades, for example
+# if you want to increase puppet open-files-limit to 10000,
+# you need to increase systemd's LimitNOFILE setting, so create a file named
+# "/etc/systemd/system/puppet.service.d/limits.conf" containing:
+# [Service]
+# LimitNOFILE=10000
+# You can confirm it worked by running systemctl daemon-reload
+# then running systemctl show puppet | grep LimitNOFILE
+#
 [Unit]
 Description=Puppet agent
 Wants=basic.target
-After=basic.target network.target puppetmaster.service
+After=basic.target network.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/puppetagent
 EnvironmentFile=-/etc/sysconfig/puppet
+EnvironmentFile=-/etc/default/puppet
 ExecStart=/opt/puppetlabs/puppet/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
+ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 
 [Install]

data/ext/upload_facts.rb

@@ -58,7 +58,7 @@ is also a valid long argument.  For example, 'server' is a valid configuration
 parameter, so you can specify '--server <servername>' as an argument.
 
 See the configuration file documentation at
-http://docs.puppetlabs.com/references/stable/configuration.html for
+https://docs.puppetlabs.com/puppet/latest/reference/configuration.html for
 the full list of acceptable parameters. A commented list of all
 configuration options can also be generated by running puppet agent with
 '--genconfig'.

data/ext/windows/puppet_interactive.bat

@@ -0,0 +1,6 @@
+@echo off
+SETLOCAL
+echo Running Puppet agent on demand ...
+cd "%~dp0"
+call puppet.bat agent --test %*
+PAUSE