puppet 3.4.3 → 3.5.0.rc1

data/CONTRIBUTING.md

@@ -9,7 +9,7 @@ top of things.
 
 ## Getting Started
 
-* Make sure you have a [Redmine account](http://projects.puppetlabs.com)
+* Make sure you have a [Jira account](http://tickets.puppetlabs.com)
 * Make sure you have a [GitHub account](https://github.com/signup/free)
 * Submit a ticket for your issue, assuming one does not already exist.
   * Clearly describe the issue including steps to reproduce when it is a bug.
@@ -31,7 +31,7 @@ top of things.
 * Make sure your commit messages are in the proper format.
 
 ````
-    (#99999) Make the example in CONTRIBUTING imperative and concrete
+    (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
@@ -52,7 +52,7 @@ top of things.
 ### Documentation
 
 For changes of a trivial nature to comments and documentation, it is not
-always necessary to create a new ticket in Redmine. In this case, it is
+always necessary to create a new ticket in Jira. In this case, it is
 appropriate to start the first line of a commit with '(doc)' instead of
 a ticket number. 
 
@@ -74,13 +74,13 @@ a ticket number.
 * Sign the [Contributor License Agreement](http://links.puppetlabs.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 Redmine ticket to mark that you have submitted code and are ready for it to be reviewed.
-  * Include a link to the pull request in the ticket
+* 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.
 
 # Additional Resources
 
 * [More information on contributing](http://links.puppetlabs.com/contribute-to-puppet)
-* [Bug tracker (Redmine)](http://projects.puppetlabs.com)
+* [Bug tracker (Jira)](http://tickets.puppetlabs.com)
 * [Contributor License Agreement](http://links.puppetlabs.com/cla)
 * [General GitHub documentation](http://help.github.com/)
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)

data/Gemfile

@@ -19,7 +19,7 @@ platforms :ruby do
 end
 
 gem "puppet", :path => File.dirname(__FILE__), :require => false
-gem "facter", *location_for(ENV['FACTER_LOCATION'] || '~> 1.6')
+gem "facter", *location_for(ENV['FACTER_LOCATION'] || ['> 1.6', '< 3'])
 gem "hiera", *location_for(ENV['HIERA_LOCATION'] || '~> 1.0')
 gem "rake", :require => false
 gem "rgen", "0.6.5", :require => false
@@ -44,12 +44,20 @@ group(:development, :test) do
     gem "multi_json", "1.7.7", :require => false
     gem "json-schema", "2.1.1", :require => false
   end
+end
 
+group(:development) do
+  case RUBY_VERSION
+  when /^1.8/
+    gem 'ruby-prof', "~> 0.13.1", :require => false
+  else
+    gem 'ruby-prof', :require => false
+  end
 end
 
 group(:extra) do
   gem "rack", "~> 1.4", :require => false
-  gem "activerecord", '~> 3.0.7', :require => false
+  gem "activerecord", '~> 3.2', :require => false
   gem "couchrest", '~> 1.0', :require => false
   gem "net-ssh", '~> 2.1', :require => false
   gem "puppetlabs_spec_helper", :require => false
@@ -59,20 +67,18 @@ group(:extra) do
   gem "msgpack", :require => false
 end
 
-platforms :mswin, :mingw do
-  gem "ffi", "1.9.0", :require => false
-  gem "sys-admin", "1.5.6", :require => false
-  gem "win32-api", "1.4.8", :require => false
-  gem "win32-dir", "0.4.3", :require => false
-  gem "win32-eventlog", "0.5.3", :require => false
-  gem "win32-process", "0.6.5", :require => false
-  gem "win32-security", "0.1.4", :require => false
-  gem "win32-service", "0.7.2", :require => false
-  gem "win32-taskscheduler", "0.2.2", :require => false
-  gem "win32console", "1.3.2", :require => false
-  gem "windows-api", "0.4.2", :require => false
-  gem "windows-pr", "1.2.2", :require => false
-  gem "minitar", "0.5.4", :require => false
+require 'yaml'
+data = YAML.load_file(File.join(File.dirname(__FILE__), 'ext', 'project_data.yaml'))
+bundle_platforms = data['bundle_platforms']
+data['gem_platform_dependencies'].each_pair do |gem_platform, info|
+  if bundle_deps = info['gem_runtime_dependencies']
+    bundle_platform = bundle_platforms[gem_platform] or raise "Missing bundle_platform"
+    platform(bundle_platform.intern) do
+      bundle_deps.each_pair do |name, version|
+        gem(name, version, :require => false)
+      end
+    end
+  end
 end
 
 if File.exists? "#{__FILE__}.local"

data/LICENSE

@@ -1,6 +1,6 @@
    Puppet - Automating Configuration Management.
 
-   Copyright (C) 2005-2012 Puppet Labs Inc
+   Copyright (C) 2005-2014 Puppet Labs Inc
 
    Puppet Labs can be contacted at: info@puppetlabs.com
 

data/README.md

@@ -13,6 +13,10 @@ Documentation
 Documentation for Puppet and related projects can be found online at the
 [Puppet Docs site](http://docs.puppetlabs.com).
 
+HTTP API
+--------
+[HTTP API Index](api/docs/http_api_index.md)
+
 Installation
 ------------
 
@@ -26,28 +30,46 @@ To install an open source release of Puppet,
 If you need to run Puppet from source as a tester or developer,
 [see the running from source guide on the docs site.](http://docs.puppetlabs.com/guides/from_source.html)
 
-Contributions
+Developing and Contributing
 ------
 
-Please see our [Contribution
-Documents](https://github.com/puppetlabs/puppet/blob/master/CONTRIBUTING.md)
-and our [Developer
-Documentation](https://github.com/puppetlabs/puppet/blob/master/README_DEVELOPER.md).
+We'd love to get contributions from you! For a quick guide to getting your
+system setup for developing take a look at our [Quickstart
+Guide](docs/quickstart.md). Once you are up and running, take a look at the
+[Contribution Documents](CONTRIBUTING.md) to see how to get your changes merged
+in.
+
+For more complete docs on developing with puppet you can take a look at the
+rest of the [developer documents](docs/index.md).
 
 License
 -------
 
-See LICENSE file.
+See [LICENSE](LICENSE) file.
 
 Support
 -------
 
-Please log tickets and issues at our [Projects
-site](http://projects.puppetlabs.com). A [mailing
+Please log tickets and issues at our [JIRA tracker](http://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.
 
-HTTP API
---------
-{file:api/docs/http_api_index.md HTTP API Index}
+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.
+
+Bugfixes and ongoing development will occur in minor releases for the current
+major version. Security fixes will be backported to a previous major version on
+a best-effort basis, until the previous major version is no longer maintained.
+
+
+For example: If a security vulnerability is discovered in Puppet 4.1.1, we
+would fix it in the 4 series, most likely as 4.1.2. Maintainers would then make
+a best effort to backport that fix onto the latest Puppet 3 release.
+
+Long-term support, including security patches and bug fixes, is available for
+commercial customers. Please see the following page for more details:
+
+[Puppet Enterprise Support Lifecycle](http://puppetlabs.com/misc/puppet-enterprise-lifecycle)
+

data/Rakefile

@@ -64,5 +64,5 @@ task :default do
 end
 
 task :spec do
-  sh %{rspec spec}
+  sh %{rspec #{ENV['TEST'] || ENV['TESTS'] || 'spec'}}
 end

data/conf/auth.conf

@@ -110,6 +110,10 @@ auth any
 method find, save
 allow *
 
+path /v2.0/environments
+method find
+allow *
+
 # deny everything else; this ACL is not strictly necessary, but
 # illustrates the default policy.
 path /

data/ext/build_defaults.yaml

@@ -9,7 +9,7 @@ gpg_name: 'info@puppetlabs.com'
 gpg_key: '4BD6EC30'
 sign_tar: FALSE
 # a space separated list of mock configs
-final_mocks: 'pl-el-5-i386 pl-el-6-i386 pl-fedora-18-i386 pl-fedora-19-i386 pl-fedora-20-i386'
+final_mocks: 'pl-el-5-i386 pl-el-6-i386 pl-el-7-x86_64 pl-fedora-19-i386 pl-fedora-20-i386'
 yum_host: 'yum.puppetlabs.com'
 yum_repo_path: '/opt/repository/yum/'
 build_gem: TRUE

data/ext/debian/control

@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Puppet Labs <info@puppetlabs.com>
 Uploaders: Micah Anderson <micah@debian.org>, Andrew Pollock <apollock@debian.org>, Nigel Kersten <nigel@explanatorygap.net>, Stig Sandbeck Mathisen <ssm@debian.org>
-Build-Depends-Indep: ruby | ruby-interpreter, libopenssl-ruby, facter (>= 1.6.12)
+Build-Depends-Indep: ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.9.1, facter (>= 1.7.0)
 Build-Depends: debhelper (>= 7.0.0), openssl
 Standards-Version: 3.9.1
 Vcs-Git: git://github.com/puppetlabs/puppet
@@ -11,7 +11,7 @@ Homepage: http://projects.puppetlabs.com/projects/puppet
 
 Package: puppet-common
 Architecture: all
-Depends: ${misc:Depends}, ruby | ruby-interpreter, libxmlrpc-ruby, libopenssl-ruby, ruby-shadow | libshadow-ruby1.8, libaugeas-ruby | libaugeas-ruby1.9.1 | libaugeas-ruby1.8, adduser, lsb-base, sysv-rc (>= 2.86) | file-rc, hiera (>= 1.0.0), facter (>= 1.6.12), ruby-rgen (>= 0.6.5)
+Depends: ${misc:Depends}, ruby | ruby-interpreter, libxmlrpc-ruby, libopenssl-ruby | libopenssl-ruby1.9.1, ruby-shadow | libshadow-ruby1.8, libaugeas-ruby | libaugeas-ruby1.9.1 | libaugeas-ruby1.8, adduser, lsb-base, sysv-rc (>= 2.86) | file-rc, hiera (>= 1.0.0), facter (>= 1.7.0), ruby-rgen (>= 0.6.5), libjson-ruby | ruby-json
 Recommends: lsb-release, debconf-utils
 Suggests: ruby-selinux | libselinux-ruby1.8, librrd-ruby1.9.1 | librrd-ruby1.8
 Breaks: puppet (<< 2.6.0~rc2-1), puppetmaster (<< 0.25.4-1)
@@ -56,7 +56,7 @@ Description: Centralized configuration management - agent startup and compatibil
 
 Package: puppetmaster-common
 Architecture: all
-Depends: ${misc:Depends}, ruby | ruby-interpreter, puppet-common (= ${binary:Version}), facter (>= 1.6.12), lsb-base
+Depends: ${misc:Depends}, ruby | ruby-interpreter, puppet-common (= ${binary:Version}), facter (>= 1.7.0), lsb-base
 Breaks: puppet (<< 0.24.7-1), puppetmaster (<< 2.6.1~rc2-1)
 Replaces: puppetmaster (<< 2.6.1~rc2-1)
 Suggests: apache2 | nginx, puppet-el, vim-puppet, stompserver, ruby-stomp | libstomp-ruby1.8,
@@ -78,7 +78,7 @@ Description: Puppet master common scripts
 
 Package: puppetmaster
 Architecture: all
-Depends: ${misc:Depends}, ruby | ruby-interpreter, puppetmaster-common (= ${source:Version}), facter (>= 1.6.12), lsb-base
+Depends: ${misc:Depends}, ruby | ruby-interpreter, puppetmaster-common (= ${source:Version}), facter (>= 1.7.0), lsb-base
 Breaks: puppet (<< 0.24.7-1)
 Suggests: apache2 | nginx, puppet-el, vim-puppet, stompserver, ruby-stomp | libstomp-ruby1.8,
  rdoc, ruby-ldap | libldap-ruby1.8, puppetdb-terminus
@@ -99,7 +99,7 @@ Description: Centralized configuration management - master startup and compatibi
 
 Package: puppetmaster-passenger
 Architecture: all
-Depends: ${misc:Depends}, ruby | ruby-interpreter, puppetmaster-common (= ${source:Version}), facter (>= 1.6.12), lsb-base, libapache2-mod-passenger
+Depends: ${misc:Depends}, ruby | ruby-interpreter, puppetmaster-common (= ${source:Version}), facter (>= 1.7.0), lsb-base, libapache2-mod-passenger
 Conflicts: puppetmaster (<< 2.6.1~rc2-1)
 Replaces: puppetmaster (<< 2.6.1~rc2-1)
 Description: Centralised configuration management - master setup to run under mod passenger
@@ -136,7 +136,7 @@ Description: syntax highlighting for puppet manifests in emacs
 
 Package: puppet-testsuite
 Architecture: all
-Depends: ${misc:Depends}, ruby | ruby-interpreter, puppet-common (= ${source:Version}), facter (>= 1.6.12), lsb-base, rails (>= 1.2.3-2), rdoc, ruby-ldap | libldap-ruby1.8, ruby-rspec | librspec-ruby, git-core, ruby-mocha | libmocha-ruby1.8
+Depends: ${misc:Depends}, ruby | ruby-interpreter, puppet-common (= ${source:Version}), facter (>= 1.7.0), lsb-base, rails (>= 1.2.3-2), rdoc, ruby-ldap | libldap-ruby1.8, ruby-rspec | librspec-ruby, git-core, ruby-mocha | libmocha-ruby1.8
 Recommends: cron
 Description: Centralized configuration management - test suite
  This package provides all the tests from the upstream puppet source code.

data/ext/ips/transforms

@@ -27,7 +27,7 @@
 <transform file path=var/svc/manifest/.*\.xml -> add restart_fmri svc:/system/manifest-import:default>
 
 # we depend on facter
-<transform pkg -> emit depend type=require fmri=application/facter@1.6.12>
+<transform pkg -> emit depend type=require fmri=application/facter@1.7.0>
 
 # preserve the old conf file on upgrade.
 <transform file path=etc/puppet/(puppet|auth).conf -> add overlay true>

data/ext/nagios/naggen

@@ -21,7 +21,7 @@
 #
 # = Options
 #
-# Note that any configuration parameter that's valid in the configuration file
+# Note that any setting that's valid in the configuration file
 # is also a valid long argument.  For example, 'ssldir' is a valid configuration
 # parameter, so you can specify '--ssldir <directory>' as an argument.
 #

data/ext/project_data.yaml

@@ -15,12 +15,32 @@ gem_executables: 'puppet'
 gem_default_executables: 'puppet'
 gem_forge_project: 'puppet'
 gem_runtime_dependencies:
-  facter: '~> 1.6'
+  facter: ['> 1.6', '< 3']
   hiera: '~> 1.0'
   rgen: '~> 0.6.5'
+  json_pure:
 gem_rdoc_options:
   - --title
   - "Puppet - Configuration Management"
   - --main
   - README.md
   - --line-numbers
+gem_platform_dependencies:
+  x86-mingw32:
+    gem_runtime_dependencies:
+      # Pinning versions that require native extensions
+      ffi: '1.9.0'
+      sys-admin: '1.5.6'
+      win32-api: '1.4.8'
+      win32-dir: '~> 0.4.3'
+      win32-eventlog: '~> 0.5.3'
+      win32-process: '~> 0.6.5'
+      win32-security: '~> 0.1.4'
+      win32-service: '0.7.2'
+      win32-taskscheduler: '~> 0.2.2'
+      win32console:  '1.3.2'
+      windows-api: '~> 0.4.2'
+      windows-pr: '~> 1.2.2'
+      minitar: '~> 0.5.4'
+bundle_platforms:
+  x86-mingw32: mingw

data/ext/puppet-test

@@ -18,7 +18,7 @@
 #
 # = Options
 #
-# Note that any configuration parameter that's valid in the configuration file
+# Note that any setting that's valid in the configuration file
 # is also a valid long argument.  For example, 'server' is a valid configuration
 # parameter, so you can specify '--server <servername>' as an argument.
 #
@@ -241,7 +241,7 @@ Suite.new :resource_type, "Managing resource types" do
         ARGV.each do |name|
             json = Puppet::Resource::Type.find(name).to_pson
             data = PSON.parse(json)
-            p Puppet::Resource::Type.from_pson(data)
+            p Puppet::Resource::Type.from_data_hash(data)
         end
     end
 
@@ -474,7 +474,7 @@ begin
     explicit_waitforcert = false
     result.each { |opt,arg|
         case opt
-            # First check to see if the argument is a valid configuration parameter;
+            # First check to see if the argument is a valid setting;
             # if so, set it.
             when "--compile"
                 $options[:suite] = :configuration

data/ext/redhat/puppet.spec.erb

@@ -20,6 +20,8 @@
 %global rpmversion <%= @rpmversion %>
 
 %global confdir ext/redhat
+%global pending_upgrade_path %{_localstatedir}/lib/rpm-state/puppet
+%global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending
 
 Name:           puppet
 Version:        %{rpmversion}
@@ -34,12 +36,13 @@ Group:          System Environment/Base
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  facter < 1:2.0
+BuildRequires:  facter >= 1:1.7.0
 # Puppet 3.x drops ruby 1.8.5 support and adds ruby 1.9 support
 BuildRequires:  ruby >= 1.8.7
 BuildArch:      noarch
 Requires:       ruby >= 1.8
 Requires:       ruby-shadow
+Requires:       rubygem-json
 
 # Pull in ruby selinux bindings where available
 %if 0%{?fedora} || 0%{?rhel} >= 6
@@ -50,7 +53,7 @@ Requires:       ruby-shadow
 %endif
 %endif
 
-Requires:       facter >= 1.6.11
+Requires:       facter >= 1:1.7.0
 # Puppet 3.x drops ruby 1.8.5 support and adds ruby 1.9 support
 # Ruby 1.8.7 available for el5 at: yum.puppetlabs.com/el/5/devel/$ARCH
 Requires:       ruby >= 1.8.7
@@ -358,6 +361,23 @@ if [ "$1" -eq 0 ] ; then
     /bin/systemctl stop puppet.service > /dev/null 2>&1 || :
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
+
+if [ "$1" == "1" ]; then
+    /bin/systemctl is-enabled puppetagent.service > /dev/null 2>&1
+    if [ "$?" == "0" ]; then
+        /bin/systemctl --no-reload disable puppetagent.service > /dev/null 2>&1 ||:
+        /bin/systemctl stop puppetagent.service > /dev/null 2>&1 ||:
+        /bin/systemctl daemon-reload >/dev/null 2>&1 ||:
+        if [ ! -d %{pending_upgrade_path} ]; then
+            mkdir -p %{pending_upgrade_path}
+        fi
+
+        if [ ! -e %{pending_upgrade_file} ]; then
+            touch %{pending_upgrade_file}
+        fi
+    fi
+fi
+
 %else
 if [ "$1" = 0 ] ; then
     /sbin/service puppet stop > /dev/null 2>&1
@@ -383,6 +403,12 @@ fi
 %postun
 %if 0%{?_with_systemd}
 if [ $1 -ge 1 ] ; then
+    if [ -e %{pending_upgrade_file} ]; then
+        /bin/systemctl --no-reload enable puppet.service > /dev/null 2>&1 ||:
+        /bin/systemctl start puppet.service > /dev/null 2>&1 ||:
+        /bin/systemctl daemon-reload >/dev/null 2>&1 ||:
+        rm %{pending_upgrade_file}
+    fi
     # Package upgrade, not uninstall
     /bin/systemctl try-restart puppetagent.service >/dev/null 2>&1 || :
 fi

data/ext/suse/puppet.spec

@@ -14,7 +14,7 @@ Source0: http://puppetlabs.com/downloads/puppet/%{name}-%{version}.tar.gz
 
 PreReq: %{insserv_prereq} %{fillup_prereq}
 Requires: ruby >= 1.8.7
-Requires: facter >= 1.6.11
+Requires: facter >= 1:1.7.0
 Requires: cron
 Requires: logrotate
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

data/ext/upload_facts.rb

@@ -53,7 +53,7 @@ uploaded.
 
 = Options
 
-Note that any configuration parameter that's valid in the configuration file
+Note that any setting that's valid in the configuration file
 is also a valid long argument.  For example, 'server' is a valid configuration
 parameter, so you can specify '--server <servername>' as an argument.
 

data/ext/windows/service/daemon.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'win32/daemon'
 require 'win32/dir'
 require 'win32/process'
+require 'win32/eventlog'
 
 require 'windows/synchronize'
 require 'windows/handle'
@@ -13,6 +14,7 @@ class WindowsDaemon < Win32::Daemon
   include Windows::Handle
   include Windows::Process
 
+  @LOG_TO_FILE = false
   LOG_FILE =  File.expand_path(File.join(Dir::COMMON_APPDATA, 'PuppetLabs', 'puppet', 'var', 'log', 'windows.log'))
   LEVELS = [:debug, :info, :notice, :err]
   LEVELS.each do |level|
@@ -22,28 +24,46 @@ class WindowsDaemon < Win32::Daemon
   end
 
   def service_init
-    FileUtils.mkdir_p(File.dirname(LOG_FILE))
   end
 
-  def service_main(*argv)
-    args = argv.join(' ')
-    @loglevel = LEVELS.index(argv.index('--debug') ? :debug : :notice)
+  def service_main(*argsv)
+    argsv = (argsv << ARGV).flatten.compact
+    args = argsv.join(' ')
+    @loglevel = LEVELS.index(argsv.index('--debug') ? :debug : :notice)
 
-    log_notice("Starting service: #{args}")
+    @LOG_TO_FILE = (argsv.index('--logtofile') ? true : false)
 
-    while running? do
-      return if state != RUNNING
-
-      log_notice('Service running')
+    if (@LOG_TO_FILE)
+      FileUtils.mkdir_p(File.dirname(LOG_FILE))
+      args = args.gsub("--logtofile","")
+    end
+    basedir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+    # The puppet installer registers a 'Puppet' event source.  For the moment events will be logged with this key, but
+    # it may be a good idea to split the Service and Puppet events later so it's easier to read in the windows Event Log.
+    #
+    # Example code to register an event source;
+    # eventlogdll =  File.expand_path(File.join(basedir, 'puppet', 'ext', 'windows', 'eventlog', 'puppetres.dll'))
+    # if (File.exists?(eventlogdll))
+    #   Win32::EventLog.add_event_source(
+    #      'source' => "Application",
+    #      'key_name' => "Puppet Agent",
+    #      'category_count' => 3,
+    #      'event_message_file' => eventlogdll,
+    #      'category_message_file' => eventlogdll
+    #   )
+    # end
+
+    puppet = File.join(basedir, 'bin', 'puppet.bat')
+    unless File.exists?(puppet)
+      log_err("File not found: '#{puppet}'")
+      return
+    end
+    log_debug("Using '#{puppet}'")
 
-      basedir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-      puppet = File.join(basedir, 'bin', 'puppet.bat')
-      unless File.exists?(puppet)
-        log_err("File not found: '#{puppet}'")
-        return
-      end
+    log_notice('Service started')
 
-      log_debug("Using '#{puppet}'")
+    while running? do
       begin
         runinterval = %x{ "#{puppet}" agent --configprint runinterval }.to_i
         if runinterval == 0
@@ -55,12 +75,17 @@ class WindowsDaemon < Win32::Daemon
         runinterval = 1800
       end
 
-      pid = Process.create(:command_line => "\"#{puppet}\" agent --onetime #{args}", :creation_flags => Process::CREATE_NEW_CONSOLE).process_id
-      log_debug("Process created: #{pid}")
+      if state == RUNNING or state == IDLE
+        log_notice("Executing agent with arguments: #{args}")
+        pid = Process.create(:command_line => "\"#{puppet}\" agent --onetime #{args}", :creation_flags => Process::CREATE_NEW_CONSOLE).process_id
+        log_debug("Process created: #{pid}")
+      else
+        log_debug("Service is paused.  Not invoking Puppet agent")
+      end
 
       log_debug("Service waiting for #{runinterval} seconds")
       sleep(runinterval)
-      log_debug('Service resuming')
+      log_debug('Service woken up')
     end
 
     log_notice('Service stopped')
@@ -73,6 +98,26 @@ class WindowsDaemon < Win32::Daemon
     Thread.main.wakeup
   end
 
+  def service_pause
+    # The service will not stay in a paused stated, instead it will go back into a running state after a short period of time.  This is an issue in the Win32-Service ruby code
+    # Raised bug https://github.com/djberg96/win32-service/issues/11 and is fixed in version 0.8.3.
+    # Because the Pause feature is so rarely used, there is no point in creating a workaround until puppet uses 0.8.3.
+    log_notice('Service pausing. The service will not stay paused. See Puppet Issue PUP-1471 for more information')
+  end
+
+  def service_resume
+    log_notice('Service resuming')
+  end
+
+  def service_shutdown
+    log_notice('Host shutting down')
+  end
+
+  # Interrogation handler is just for debug.  Can be commented out or removed entirely.
+  # def service_interrogate
+  #   log_debug('Service is being interrogated')
+  # end
+
   def log_exception(e)
     log_err(e.message)
     log_err(e.backtrace.join("\n"))
@@ -80,7 +125,41 @@ class WindowsDaemon < Win32::Daemon
 
   def log(msg, level)
     if LEVELS.index(level) >= @loglevel
-      File.open(LOG_FILE, 'a') { |f| f.puts("#{Time.now} Puppet (#{level}): #{msg}") }
+      if (@LOG_TO_FILE)
+        File.open(LOG_FILE, 'a') { |f| f.puts("#{Time.now} Puppet (#{level}): #{msg}") }
+      end
+
+      case level
+        when :debug
+          report_windows_event(Win32::EventLog::INFO,0x01,msg.to_s)
+        when :info
+          report_windows_event(Win32::EventLog::INFO,0x01,msg.to_s)
+        when :notice
+          report_windows_event(Win32::EventLog::INFO,0x01,msg.to_s)
+        when :err
+          report_windows_event(Win32::EventLog::ERR,0x03,msg.to_s)
+        else
+          report_windows_event(Win32::EventLog::WARN,0x02,msg.to_s)
+      end
+    end
+  end
+
+  def report_windows_event(type,id,message)
+    begin
+      eventlog = nil
+      eventlog = Win32::EventLog.open("Application")
+      eventlog.report_event(
+        :source      => "Puppet",
+        :event_type  => type,   # Win32::EventLog::INFO or WARN, ERROR
+        :event_id    => id,     # 0x01 or 0x02, 0x03 etc.
+        :data        => message # "the message"
+      )
+    rescue Exception => e
+      # Ignore all errors
+    ensure
+      if (!eventlog.nil?)
+        eventlog.close
+      end
     end
   end
 end