puppet 2.7.13 → 2.7.14

data/CHANGELOG

@@ -1,3 +1,128 @@
+2.7.14
+===
+42b20be (#13682) Fix acceptance test failures
+dce3c32 (#13682) Rename Puppet::Module::Tool to Puppet::ModuleTool
+5117e12 (maint) Ensure every file has a trailing newlines
+c255414 (#14036) Add upstart tests
+dc3bb9f (#14036) Handle upstart better
+74e462f (#14060) Fix quoting of commands to interpolate inside the shell.
+796a072 Modernize the style of the shell exec provider tests.
+934ec89 Improve deprecation warning for dynamic lookup
+0d9e852 Removed duplication of compiling a catalog
+d67711d Cleaner test for create_resources doing nothing
+2d3cc63 Fixing problem caused by activerecord
+f1331ba Put back require 'puppet' in Puppet::Util
+79bf4fa (#13299) Fix error message when agent is disabled
+5178adc Update puppet.spec for rpm packaging
+fb96747 Fixed old log test to match new autoflush behavior
+878127f Make sure the log file writable
+72d3b56 Default autoflushing of log files to true
+9711d50 Created test that shows enc warning problem
+d54100d (Maint) Fix order-dependent test failure
+f531400 (Maint) Don't assume eventlog gem is installed on Windows
+2957ffe Fix tempfile cleanup in specs
+e2d6915 Fix communication_error acceptance test
+27a5eb7 options[:ca_location] is a string not a symbol. Safer to pull Puppet::SSL::Host.ca_location since it is already set correctly.
+c01cac9 (#13204) Don't ignore missing PATH.augnew files
+7d27cd2 Use :as_platform in the smf service spec
+876785a Use :as_platform in the redhat service spec
+a7181c8 (#13640) Only agents should use next_agent_run
+9aa302f Increased test coverage of scoping rules
+163ab8c Use more descriptive terms for the differing scopes
+2ddb3d6 Make new scoping look through inherited scopes
+b519e24 Add tests for mixed inheritence/inclusion
+48bce6b Remove dynamic option for lookupvar
+2e78aad Implement newlookupvar() to replace dynamic scope
+9c94586 Tests for deprecation warnings for dynamic scoping
+2ff6fe4 (#13690) add comments to spec_helper
+100f42c (#12392) Don't require eventlog gem on non-Windows platforms
+b6ee08a (#13690) Update 2.7.x for spec_helper compatibility with external projects
+1306611 (maint) Remove unnecessary step from puppet module build help
+7afcb04 (#9167) Do not send email when nothing changes
+a26ff16 [#13686] Fix directoryservices ShadowHashData code
+b85cdc9 Fixup tests to work on CentOS 5
+7e78094 (#13659) Convert fact values to string when searching database
+fc2964f fix bug in Util#symbolizehash!
+46d8973 (#13567) Fix create_resources name parameter bug
+8d2ff89 (#12392) Add eventlog destination and log to it by default on Windows
+bca4849 (#13636) Update Module Face copyright date
+e7d3911 (#13649) Restrict module name matching
+9cbda49 (#13643) Make the use of FileUtils.rm_rf secure
+6819cf3 (#13642) Move search notice message
+28531f8 (#13639) Don't send errors directly to stderr
+45f8009 (#13638) Add SemVer#pre function
+a2990a8 (#13737) Swap build_tree and format_tree method names
+f0625ef (#12392) Created Windows eventlog message resource dll
+245c6b7 (#9167) Do not send email when nothing changes
+1b810b1 (#3581) Stop forking around: Add fork helper method
+1de8bd7 Add Module Tool
+e24755d (#13397) fix gem provider ensure=>latest bug
+271c7f2 Make core changes needed for the puppet module tool
+7994400 (#13367) Patch SemVer to permit ranges including pre-release components.
+1342558 Monkey patch FileUtils.mv in Ruby 1.8.5
+3f28268 (#12101) Make Puppet::Util::absolute_path? usable in autoloader
+772f756 (#12101) Add shared context for specs to imitate windows or posix
+8f84207 (#12466) unset X-Forwarded-For header
+49eabd4 Quote strings containing hex numbers when generating ZAML
+f5487bd (#13439) refactor spec helper for spec compatibility between 2.7 and master
+db17d7c (#13380) Cron acceptance tests don't ensure cron actually installed
+0498d55 (#13204) Workaround duplicate Augeas save events
+7048e88 (#3022) File type's force attribute's description is incomplete
+43003f5 (Maint) Consistently use the same agent fqdn
+95c2b90 Stub execpipe using StringIO
+ca32364 (#13117) Fix selmodule error on each_lines
+bdb5922 (Maint) Don't change permissions on /etc/hosts
+40ee256 Finally, stop using the `foo` name in the type_spec test.
+245f1b9 Clean up the "foo" name in create_resources_spec.
+eb2c71b Clean up "foo" name in global resource state.
+ec5c4bf Document the problem with the `apply_to_device` and related methods.
+d6da1b7 Fix hash comparison under RSpec with 1.8.5
+0b7841a (#12960) Fix puppet resource <type> if type has no providers
+6a31287 (#12981) Fix external subcommand exit status
+a2208d0 (#10722) Add spec to verify that an error is logged on bad http
+7207b68 (#10722) Refactor http_spec to use expectations
+54e5d18 (#7986) Modify pkg provider to handle publisher
+2e32924 (#7986) Cleanup pkg provider #2
+113fc54 (#7986) Cleanup pkg provider #1
+452e2c4 (#7592) Remove redundant call to String#to_s
+ee554eb (#10722) Display errors on HTTP report submission failures
+2973d5c (#11988) Work around Augeas reload bug when changing save modes
+dfefc23 (#11988) Don't overwrite symlinks in augeas provider
+d27af92 Stubbing time is risky, better an approximate compare.
+01c8623 Don't stub the database in Puppet::Rails tests.
+c4b3c84 (#9491) Preserve trailing slashes in FileSettings
+27bd6bc (#8312) Fix zypper provider so ensure => 'latest' now works
+c6d656a (#1076) Show warning if an empty group is specified
+e1f9957 Maint: Remove unused mock objects in user spec
+bc64d9b Maint: Use real objects in user spec
+7eb4f5b Maint: Add a real provider class to user spec
+d28c62a Maint: Remove unused variable in user spec
+dba27c9 (#4862) Finally remove the event-loop library.
+8e11766 (#4862) define_method is not a public method in Ruby.
+11501a7 (#4862) `returning` is not a standard Ruby method.
+30a23ac (#4862) Stop using EventLoop in the Puppet daemon.
+a61c785 Updating CHANGELOG and lib/puppet.rb for 2.6.14
+60b7aa5 Prior to this commit we hard coded paths in two tests that depended on our CI system directory structure. This made it hard to use our acceptance suite without also includin
+600a6e7 Clean up and unify scratch database setup logic.
+17a5302 Make PuppetSpec::Files methods available at module level.
+3857e2b Fix stubbing of ActiveRecord that doesn't work in AR 3.2.*
+dd6d36c Fix Rails compatibility code to be less stupid.
+ade5965 Remove unnecessary fallbacks in change_{user,group}
+0a09a64 Document uid/gid-related methods in Puppet::Util
+2599d56 Copy owner/group in replace_file
+ead36ff (#12463) eliminate `secure_open` in favour of `replace_file`
+1469538 (#12460) use `replace_file` for the .k5login file
+8461203 (#12462) user_role_add: use `replace_file` for /etc/shadow
+0ad532a (#12463) add secure `replace_file` to Puppet::Util
+76d0749 (#12459) drop supplementary groups when permanently dropping UID
+50909b9 (#12458) default to users primary group, not root, in `asuser`
+d00c5cc (#12457) add users primary group, not Process.gid, in initgroups
+2732f25 (#12479) Don't make undef regexp match as the string undef.
+a62f711 (#8193) Add support for new ssh keytypes in authorized_key provider
+0efc65d (#8193) Add unit tests for new ssh keytypes
+5dfc436 (#8193) Support new keytypes for sshkey
+36e6642 (#8193) Support new keytypes for ssh_authorized_key
+
 2.7.13
 ===
 1f58ea6 Stub mktmpdir and remove_entry_secure in os x package providers
@@ -238,7 +363,7 @@ b28d4ce (#12296) Test cycle detection on real Puppet::Type instances.
 f11ee44 (#12464) Avoid unnecessarily reloading facts when node_name_fact is not set
 
 2.7.10
-===
+=======
 e31369a (#6541) Use the same filebucket for backup and restore
 0d8a22a (#11767) No longer necessary to delete ssl directory in each test
 e1828ba Updated CHANGELOG for 2.7.10rc1
@@ -1950,6 +2075,24 @@ d532e6d Fixing #3185 Rakefile is loading puppet.rb twice
 5aa596c Fix #3150 - require function doesn't like ::class syntax
 3457b87 Added time module to tagmail report
 
+2.6.14
+===
+ade5965 Remove unnecessary fallbacks in change_{user,group}
+0a09a64 Document uid/gid-related methods in Puppet::Util
+2599d56 Copy owner/group in replace_file
+ead36ff (#12463) eliminate `secure_open` in favour of `replace_file`
+1469538 (#12460) use `replace_file` for the .k5login file
+8461203 (#12462) user_role_add: use `replace_file` for /etc/shadow
+0ad532a (#12463) add secure `replace_file` to Puppet::Util
+76d0749 (#12459) drop supplementary groups when permanently dropping UID
+50909b9 (#12458) default to users primary group, not root, in `asuser`
+d00c5cc (#12457) add users primary group, not Process.gid, in initgroups
+d937ae3 (#6541) Use the same filebucket for backup and restore
+a758066 (#11996) Fix test failures due to hash processing order changes.
+e0e31d5 (#5246) Puppetd does not remove it's pidfile when it exits
+0ab4597 (#11764) Fix failing cron test
+073ca03 (#11764) Fix cron jobs for passing block to method
+
 2.6.13
 ===
 e4ee794 (#10739) Provide default subjectAltNames while bootstrapping master

data/conf/osx/preflight

@@ -21,4 +21,4 @@
 /bin/rm -Rf "${3}{BINDIR}/puppetd"
 /bin/rm -Rf "${3}{BINDIR}/puppetmasterd"
 /bin/rm -Rf "${3}{BINDIR}/puppetqd"
-/bin/rm -Rf "${3}{BINDIR}/puppetrun"
+/bin/rm -Rf "${3}{BINDIR}/puppetrun"

data/conf/redhat/puppet.spec

@@ -5,7 +5,7 @@
 %global confdir conf/redhat
 
 Name:           puppet
-Version:        2.7.12
+Version:        2.7.14
 #Release:        0.1rc1%{?dist}
 Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
@@ -21,13 +21,11 @@ Group:          System Environment/Base
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  facter >= 1.5
-BuildRequires:  ruby >= 1.8.1
+BuildRequires:  ruby >= 1.8.5
 
-%if 0%{?fedora} || 0%{?rhel} >= 5
 BuildArch:      noarch
 Requires:       ruby(abi) >= 1.8
 Requires:       ruby-shadow
-%endif
 
 # Pull in ruby selinux bindings where available
 %if 0%{?fedora} || 0%{?rhel} >= 6
@@ -39,7 +37,7 @@ Requires:       ruby-shadow
 %endif
 
 Requires:       facter >= 1.5
-Requires:       ruby >= 1.8.1
+Requires:       ruby >= 1.8.5
 %{!?_without_augeas:Requires: ruby-augeas}
 
 Requires(pre):  shadow-utils
@@ -285,6 +283,12 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Wed May 02 2012 Moses Mendoza <moses@puppetlabs.com> - 2.7.14-1
+- Update for 2.7.14
+
+* Tue Apr 10 2012 Matthaus Litteken <matthaus@puppetlabs.com> - 2.7.13-1
+- Update for 2.7.13
+
 * Mon Mar 12 2012 Michael Stahnke <stahnma@puppetlabs.com> - 2.7.12-1
 - Update for 2.7.12
 

data/conf/suse/puppet.spec

@@ -4,7 +4,7 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 2.7.12
+Version: 2.7.14
 Release: 1%{?dist}
 License: Apache 2.0
 Group:    Productivity/Networking/System
@@ -136,6 +136,9 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -exec chmod a-x '{}' \;
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Wed May 02 2012 Moses Mendoza <moses@puppetlabs.com> - 2.7.14-1
+- Update for 2.7.14
+
 * Mon Mar 12 2012 Michael Stahnke <stahnma@puppetlabs.com> - 2.7.12-1
 - Update for 2.7.12
 

data/conf/windows/eventlog/Rakefile

@@ -0,0 +1,32 @@
+require 'rubygems'
+require 'rake'
+require 'fileutils'
+require 'rbconfig'
+
+BASENAME = "puppetres"
+
+task :default do
+  sh 'rake -T'
+end
+
+desc 'Build puppet eventlog message dll'
+task :dist => ['out', "#{BASENAME}.dll"]
+
+directory 'out'
+
+rule '.rc' => '.mc' do |t|
+  sh "mc -b -r out -h out #{t.source}"
+end
+
+rule '.res' => '.rc' do |t|
+  sh "rc -nologo -r -fo out/#{t.name} out/#{t.source}"
+end
+
+rule '.dll' => '.res' do |t|
+  sh "link -nologo -dll -noentry -machine:x86 -out:out/#{t.name} out/#{t.source}"
+end
+
+desc 'Delete generated files'
+task :clean do
+  FileUtils.rm_rf('out')
+end

data/conf/windows/eventlog/puppetres.mc

@@ -0,0 +1,18 @@
+MessageId=0x1
+SymbolicName=PUPPET_INFO
+Language=English
+%1
+.
+
+MessageId=0x2
+SymbolicName=PUPPET_WARN
+Language=English
+%1
+.
+
+MessageId=0x3
+SymbolicName=PUPPET_ERROR
+Language=English
+%1
+.
+

data/ext/rack/files/apache2.conf

@@ -26,6 +26,9 @@ Listen 8140
         SSLVerifyDepth  1
         SSLOptions +StdEnvVars
 
+        # This header needs to be set if using a loadbalancer or proxy
+        RequestHeader unset X-Forwarded-For
+
         RequestHeader set X-SSL-Subject %{SSL_CLIENT_S_DN}e
         RequestHeader set X-Client-DN %{SSL_CLIENT_S_DN}e
         RequestHeader set X-Client-Verify %{SSL_CLIENT_VERIFY}e

data/install.rb

@@ -86,7 +86,29 @@ def do_configs(configs, target, strip = 'conf/')
     else
       FileUtils.install(cf, ocf, {:mode => 0644, :verbose => true})
     end
-   end
+  end
+
+  if $operatingsystem == 'windows'
+    src_dll = 'conf/windows/eventlog/puppetres.dll'
+    dst_dll = File.join(InstallOptions.bin_dir, 'puppetres.dll')
+    if $haveftools
+      File.install(src_dll, dst_dll, 0644, true)
+    else
+      FileUtils.install(src_dll, dst_dll, {:mode => 0644, :verbose => true})
+    end
+
+    require 'win32/registry'
+    include Win32::Registry::Constants
+
+    begin
+      Win32::Registry::HKEY_LOCAL_MACHINE.create('SYSTEM\CurrentControlSet\services\eventlog\Application\Puppet', KEY_ALL_ACCESS | 0x0100) do |reg|
+        reg.write_s('EventMessageFile', dst_dll.tr('/', '\\'))
+        reg.write_i('TypesSupported', 0x7)
+      end
+    rescue Win32::Registry::Error => e
+      warn "Failed to create puppet eventlog registry key: #{e}"
+    end
+  end
 end
 
 def do_bins(bins, target, strip = 's?bin/')

data/lib/puppet.rb

@@ -24,7 +24,7 @@ require 'puppet/util/run_mode'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-  PUPPETVERSION = '2.7.13'
+  PUPPETVERSION = '2.7.14'
 
   def Puppet.version
     PUPPETVERSION

data/lib/puppet/agent.rb

@@ -1,5 +1,4 @@
 require 'sync'
-require 'puppet/external/event-loop'
 require 'puppet/application'
 
 # A general class for triggering a run of another
@@ -32,7 +31,7 @@ class Puppet::Agent
       return
     end
     if disabled?
-      Puppet.notice "Skipping run of #{client_class}; administratively disabled; use 'puppet #{client_class} --enable' to re-enable."
+      Puppet.notice "Skipping run of #{client_class}; administratively disabled; use 'puppet agent --enable' to re-enable."
       return
     end
 
@@ -75,18 +74,6 @@ class Puppet::Agent
     @splayed = true
   end
 
-  # Start listening for events.  We're pretty much just listening for
-  # timer events here.
-  def start
-    # Create our timer.  Puppet will handle observing it and such.
-    timer = EventLoop::Timer.new(:interval => Puppet[:runinterval], :tolerance => 1, :start? => true) do
-      run
-    end
-
-    # Run once before we start following the timer
-    timer.sound_alarm
-  end
-
   def sync
     @sync ||= Sync.new
   end

data/lib/puppet/application/kick.rb

@@ -201,7 +201,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       # do, then do the next host.
       if @children.length < options[:parallel] and ! todo.empty?
         host = todo.shift
-        pid = fork do
+        pid = safe_posix_fork do
           run_for_host(host)
         end
         @children[pid] = host

data/lib/puppet/application/module.rb

@@ -0,0 +1,11 @@
+require 'puppet/application/face_base'
+
+class Puppet::Application::Module < Puppet::Application::FaceBase
+  def setup
+    super
+    if self.render_as.name == :console
+      Puppet::Util::Log.close(:console)
+      Puppet::Util::Log.newdestination(:telly_prototype_console)
+    end
+  end
+end

data/lib/puppet/daemon.rb

@@ -1,6 +1,5 @@
 require 'puppet'
 require 'puppet/util/pidlock'
-require 'puppet/external/event-loop'
 require 'puppet/application'
 
 # A module that handles operations common to all daemons.  This is included
@@ -120,10 +119,82 @@ class Puppet::Daemon
     create_pidfile
 
     raise Puppet::DevError, "Daemons must have an agent, server, or both" unless agent or server
+
+    # Start the listening server, if required.
     server.start if server
-    agent.start if agent
 
-    EventLoop.current.run
+    # Finally, loop forever running events - or, at least, until we exit.
+    run_event_loop
+  end
+
+  def run_event_loop
+    # Now, we loop waiting for either the configuration file to change, or the
+    # next agent run to be due.  Fun times.
+    #
+    # We want to trigger the reparse if 15 seconds passed since the previous
+    # wakeup, and the agent run if Puppet[:runinterval] seconds have passed
+    # since the previous wakeup.
+    #
+    # We always want to run the agent on startup, so it was always before now.
+    # Because 0 means "continuously run", `to_i` does the right thing when the
+    # input is strange or badly formed by returning 0.  Integer will raise,
+    # which we don't want, and we want to protect against -1 or below.
+    next_agent_run = 0
+    agent_run_interval = [Puppet[:runinterval].to_i, 0].max
+
+    # We may not want to reparse; that can be disable.  Fun times.
+    next_reparse = 0
+    reparse_interval = Puppet[:filetimeout].to_i
+
+    loop do
+      now = Time.now.to_i
+
+      # We set a default wakeup of "one hour from now", which will
+      # recheck everything at a minimum every hour.  Just in case something in
+      # the math messes up or something; it should be inexpensive enough to
+      # wake once an hour, then go back to sleep after doing nothing, if
+      # someone only wants listen mode.
+      next_event = now + 60 * 60
+
+      # Handle reparsing of configuration files, if desired and required.
+      # `reparse` will just check if the action is required, and would be
+      # better named `reparse_if_changed` instead.
+      if reparse_interval > 0 and now >= next_reparse
+        Puppet.settings.reparse
+
+        # The time to the next reparse might have changed, so recalculate
+        # now.  That way we react dynamically to reconfiguration.
+        reparse_interval = Puppet[:filetimeout].to_i
+
+        # Set up the next reparse check based on the new reparse_interval.
+        if reparse_interval > 0
+          next_reparse = now + reparse_interval
+          next_event > next_reparse and next_event = next_reparse
+        end
+
+        # We should also recalculate the agent run interval, and adjust the
+        # next time it is scheduled to run, just in case.  In the event that
+        # we made no change the result will be a zero second adjustment.
+        new_run_interval    = [Puppet[:runinterval].to_i, 0].max
+        next_agent_run     += agent_run_interval - new_run_interval
+        agent_run_interval  = new_run_interval
+      end
+
+      # Handle triggering another agent run.  This will block the next check
+      # for configuration reparsing, which is a desired and deliberate
+      # behaviour.  You should not change that. --daniel 2012-02-21
+      if agent and now >= next_agent_run
+        agent.run
+
+        # Set up the next agent run time
+        next_agent_run = now + agent_run_interval
+        next_event > next_agent_run and next_event = next_agent_run
+      end
+
+      # Finally, an interruptable able sleep until the next scheduled event.
+      how_long = next_event - now
+      how_long > 0 and select([], [], [], how_long)
+    end
   end
 end