puppet 4.2.3-x86-mingw32 → 4.3.0-x86-mingw32

data/Gemfile

@@ -49,6 +49,9 @@ group(:development, :test) do
   gem "rubocop", "~> 0.26.1", :platforms => [:ruby]
 
   gem 'rdoc', "~> 4.1", :platforms => [:ruby]
+
+  gem 'webmock'
+  gem 'vcr', '~> 2.9'
 end
 
 group(:development) do

data/README.md

@@ -51,7 +51,7 @@ See [LICENSE](LICENSE) file.
 Support
 -------
 
-Please log tickets and issues at our [JIRA tracker](http://tickets.puppetlabs.com).  A [mailing
+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
 is an active #puppet channel on Freenode.

data/ext/debian/puppet.init

@@ -8,7 +8,6 @@
 # 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
 DAEMON_OPTS=""
 NAME="agent"

data/ext/debian/puppet.logrotate

@@ -1,11 +1,20 @@
-/var/log/puppetlabs/puppet.log {
-  missingok
-  sharedscripts
-  create 0644 puppet puppet
+/var/log/puppetlabs/masterhttp.log /var/log/puppet/masterhttp.log {
   compress
   rotate 4
+  missingok
+  notifempty
+  nocreate
+}
 
+/var/log/puppetlabs/puppetd.log /var/log/puppet/puppetd.log {
+  compress
+  rotate 4
+  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/osx/puppet.plist

@@ -4,8 +4,6 @@
 <dict>
         <key>EnvironmentVariables</key>
         <dict>
-                <key>PATH</key>
-                <string>/opt/puppetlabs/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
                 <key>LANG</key>
                 <string>en_US.UTF-8</string>
         </dict>

data/ext/redhat/client.init

@@ -13,9 +13,6 @@
 # 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=/var/lock/subsys/puppet
 piddir=/var/run/puppetlabs
@@ -66,7 +63,7 @@ stop() {
 }
 
 reload() {
-    echo -n $"Restarting puppet agent: "
+    echo -n $"Reloading puppet agent: "
     if [ "$USEINITFUNCTIONS" = "true" ]; then
       killproc $pidopts $puppetd -HUP
       RETVAL=$?
@@ -82,6 +79,14 @@ reload() {
     return $RETVAL
 }
 
+rotate() {
+    echo -n $"Reopening log files for puppet agent: "
+    killproc $pidopts $puppetd -USR2
+    RETVAL=$?
+    echo
+    return $RETVAL
+}
+
 restart() {
     stop
     start
@@ -136,6 +141,9 @@ case "$1" in
     restart)
         restart
     ;;
+    rotate)
+        rotate
+    ;;
     reload|force-reload)
         reload
     ;;
@@ -154,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/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

@@ -181,13 +181,16 @@ 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)
 %doc LICENSE README.md examples
@@ -280,6 +283,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/systemd/puppet.service

@@ -8,6 +8,7 @@ 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/lib/puppet.rb

@@ -223,6 +223,18 @@ module Puppet
     @context.override(bindings, description, &block)
   end
 
+  # @param name The name of a context key to ignore; intended for test usage.
+  # @api private
+  def self.ignore(name)
+    @context.ignore(name)
+  end
+
+  # @param name The name of a previously ignored context key to restore; intended for test usage.
+  # @api private
+  def self.restore(name)
+    @context.restore(name)
+  end
+
   # @api private
   def self.mark_context(name)
     @context.mark(name)

data/lib/puppet/agent.rb

@@ -1,4 +1,5 @@
 require 'puppet/application'
+require 'puppet/error'
 
 # A general class for triggering a run of another
 # class.
@@ -29,10 +30,6 @@ class Puppet::Agent
 
   # Perform a run with our client.
   def run(client_options = {})
-    if running?
-      Puppet.notice "Run of #{client_class} already in progress; skipping  (#{lockfile_path} exists)"
-      return
-    end
     if disabled?
       Puppet.notice "Skipping run of #{client_class}; administratively disabled (Reason: '#{disable_message}');\nUse 'puppet agent --enable' to re-enable."
       return
@@ -46,6 +43,9 @@ class Puppet::Agent
           begin
             client_args = client_options.merge(:pluginsync => Puppet[:pluginsync])
             lock { client.run(client_args) }
+          rescue Puppet::LockError
+            Puppet.notice "Run of #{client_class} already in progress; skipping  (#{lockfile_path} exists)"
+            return
           rescue StandardError => detail
             Puppet.log_exception(detail, "Could not run #{client_class}: #{detail}")
           end

data/lib/puppet/agent/locker.rb

@@ -1,4 +1,5 @@
 require 'puppet/util/pidlock'
+require 'puppet/error'
 
 # This module is responsible for encapsulating the logic for "locking" the
 # puppet agent during a catalog run; in other words, keeping track of enough
@@ -12,8 +13,8 @@ require 'puppet/util/pidlock'
 # For more information, please see docs on the website.
 #  http://links.puppetlabs.com/agent_lockfiles
 module Puppet::Agent::Locker
-  # Yield if we get a lock, else do nothing.  Return
-  # true/false depending on whether we get the lock.
+  # Yield if we get a lock, else raise Puppet::LockError. Return
+  # value of block yielded.
   def lock
     if lockfile.lock
       begin
@@ -21,10 +22,18 @@ module Puppet::Agent::Locker
       ensure
         lockfile.unlock
       end
+    else
+      fail Puppet::LockError, 'Failed to aquire lock'
     end
   end
 
+  # @deprecated
   def running?
+    Puppet.deprecation_warning <<-ENDHEREDOC
+Puppet::Agent::Locker.running? is deprecated as it is inherently unsafe.
+The only safe way to know if the lock is locked is to try lock and perform some
+action and then handle the LockError that may result.
+ENDHEREDOC
     lockfile.locked?
   end
 

data/lib/puppet/application/agent.rb

@@ -322,6 +322,9 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       # waiting for certificates so that we don't block
       daemon = daemonize_process_when(Puppet[:daemonize])
 
+      # Setup signal traps immediately after daemonization so we clean up the daemon
+      daemon.set_signal_traps
+
       wait_for_certificates
 
       if Puppet[:onetime]
@@ -346,7 +349,6 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   end
 
   def onetime(daemon)
-    daemon.set_signal_traps
     begin
       exitstatus = daemon.agent.run
     rescue => detail
@@ -382,6 +384,8 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   end
 
   def setup
+    raise ArgumentError, "The puppet agent command does not take parameters" unless command_line.args.empty?
+
     setup_test if options[:test]
 
     setup_logs

data/lib/puppet/application/apply.rb

@@ -315,6 +315,10 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
     Puppet.settings.use :main, :agent, :ssl
 
+    if Puppet[:catalog_cache_terminus]
+      Puppet::Resource::Catalog.indirection.cache_class = Puppet[:catalog_cache_terminus]
+    end
+
     # we want the last report to be persisted locally
     Puppet::Transaction::Report.indirection.cache_class = :yaml
 

data/lib/puppet/application/filebucket.rb

@@ -4,6 +4,8 @@ class Puppet::Application::Filebucket < Puppet::Application
 
   option("--bucket BUCKET","-b")
   option("--debug","-d")
+  option("--fromdate FROMDATE","-f")
+  option("--todate TODATE","-t")
   option("--local","-l")
   option("--remote","-r")
   option("--verbose","-v")
@@ -25,7 +27,8 @@ USAGE
 -----
 puppet filebucket <mode> [-h|--help] [-V|--version] [-d|--debug]
   [-v|--verbose] [-l|--local] [-r|--remote] [-s|--server <server>]
-  [-b|--bucket <directory>] <file> <file> ...
+  [-f|--fromdate <date>] [-t|--todate <date>] [-b|--bucket <directory>]
+  <file> <file> ...
 
 Puppet filebucket can operate in three modes, with only one mode per call:
 
@@ -43,6 +46,13 @@ restore:
   path to this argument; you are not restricted to restoring the content
   to its original location.
 
+diff:
+  Print a diff in unified format between two checksums in the filebucket
+  or between a checksum and its matching file.
+
+list:
+  List all files in the current local filebucket. Listing remote
+  filebuckets is not allowed.
 
 DESCRIPTION
 -----------
@@ -71,6 +81,9 @@ configuration options can also be generated by running puppet with
 * --debug:
   Enable full debugging.
 
+* --fromdate:
+  (list only) Select bucket files from 'fromdate'
+
 * --help:
   Print this help message
 
@@ -85,6 +98,9 @@ configuration options can also be generated by running puppet with
 * --server:
   The server to send the file to, instead of locally.
 
+* --todate:
+  (list only) Select bucket files until 'todate'
+
 * --verbose:
   Print extra information.
 
@@ -97,7 +113,31 @@ EXAMPLE
     $ puppet filebucket backup /etc/passwd
     /etc/passwd: 429b225650b912a2ee067b0a4cf1e949
     $ puppet filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949
-
+    ## Diff between two files in the filebucket
+    $ puppet filebucket -l diff d43a6ecaa892a1962398ac9170ea9bf2 7ae322f5791217e031dc60188f4521ef
+    1a2
+    > again
+    ## Diff between the file in the filebucket and the current one
+    $ puppet filebucket -l diff d43a6ecaa892a1962398ac9170ea9bf2 /tmp/testFile
+    1a2
+    > again
+    $ puppet filebucket -l list
+    d43a6ecaa892a1962398ac9170ea9bf2 2015-05-11 09:27:56 /tmp/TestFile
+    $ echo again >> /tmp/TestFile
+    $ puppet filebucket -l backup /tmp/TestFile
+    /tmp/TestFile: 7ae322f5791217e031dc60188f4521ef
+    $ puppet filebucket -l  list
+    d43a6ecaa892a1962398ac9170ea9bf2 2015-05-11 09:27:56 /tmp/TestFile
+    7ae322f5791217e031dc60188f4521ef 2015-05-11 09:52:15 /tmp/TestFile
+    $ puppet filebucket -l -f 2015-01-01 -t 2015-01-11 list
+    <Empty Output>
+    $ puppet filebucket -l -f 2015-05-10 list
+    d43a6ecaa892a1962398ac9170ea9bf2 2015-05-11 09:27:56 /tmp/TestFile
+    7ae322f5791217e031dc60188f4521ef 2015-05-11 09:52:15 /tmp/TestFile
+    $ puppet filebucket -l -f "2015-05-11 09:30:00" list
+    7ae322f5791217e031dc60188f4521ef 2015-05-11 09:52:15 /tmp/TestFile
+    $ puppet filebucket -l -t "2015-05-11 09:30:00" list
+    d43a6ecaa892a1962398ac9170ea9bf2 2015-05-11 09:27:56 /tmp/TestFile
 
 AUTHOR
 ------
@@ -115,7 +155,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   def run_command
     @args = command_line.args
     command = args.shift
-    return send(command) if %w{get backup restore}.include? command
+    return send(command) if %w{get backup restore diff list}.include? command
     help
   end
 
@@ -142,12 +182,47 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     end
   end
 
+  def list
+    fromdate = options[:fromdate]
+    todate = options[:todate]
+    out = @client.list(fromdate, todate)
+    print out
+  end
+
   def restore
     file = args.shift
     md5 = args.shift
     @client.restore(file, md5)
   end
 
+  def diff
+    raise Puppet::Error, "Need exactly two arguments: filebucket diff <file_a> <file_b>" unless args.count == 2
+    left = args.shift
+    right = args.shift
+    if Puppet::FileSystem.exist?(left)
+      # It's a file
+      file_a = left
+      checksum_a = nil
+    else
+      file_a = nil
+      checksum_a = left
+    end
+    if Puppet::FileSystem.exist?(right)
+      # It's a file
+      file_b = right
+      checksum_b = nil
+    else
+      file_b = nil
+      checksum_b = right
+    end
+    if (checksum_a || file_a) && (checksum_b || file_b)
+      Puppet.info("Comparing #{checksum_a} #{checksum_b} #{file_a} #{file_b}")
+      print @client.diff(checksum_a, checksum_b, file_a, file_b)
+    else
+      raise Puppet::Error, "Need exactly two arguments: filebucket diff <file_a> <file_b>"
+    end
+  end
+
   def setup
     Puppet::Log.newdestination(:console)
 
@@ -181,4 +256,3 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     end
   end
 end
-