puppet 2.7.6 → 2.7.8

data/CHANGELOG

@@ -1,3 +1,171 @@
+2.7.8
+===
+3eff60a Readying for 2.7.8rc release
+e4ee794 (#10739) Provide default subjectAltNames while bootstrapping master
+2dedee6 (#2744) Don't automatically enable show_diff in noop mode
+ef78358 Give variables more descriptive names
+cd3d4ea maint: Rename xgenerate to add_dynamically_generated_resources
+000a2d8 (#6907) Prefetch unsuitable providers
+70114e9 (#6907) Allow providers to be selected in the run they become suitable
+a0ee5c7 maint: Fix incorrect whitespace
+4e8a73c Fix description in service provider test for FreeBSD
+a2eab4f (#6697) Set service provider default path to /etc/rc.d on Archlinux
+da75795 (#6335) Allow optional trailing comma in argument lists.
+47c786e Update CHANGELOG and packaging for 2.7.7 final
+8030428 (#8255) Always use string modes when creating resources from FileSetting settings
+c804346 (#7274) Output 4-digit file modes in File type
+220f2ba (#10799) Regexp escaping too much
+4462eb5 Merged 2.6.x into 2.7x
+67e048b Updated CHANGELOG for 2.7.7rc2
+93aca5a maint: Fix failing specs for Windows exec provider
+7f3a1bb (#9617) Use an RbTreeMap to store ready resources
+9eff0f4 (#9671) Implement RbTreeMap#each recursively, and #first/#last explicitly
+5f7f467 (#9671) Return nodes from internal RbTreeMap recursion
+1dc9c72 (#9671) Stop tracking size and height of nodes in RbTreeMap
+f180f9b (#9617) Add a red-black tree map
+c62e949 (#9617) Keep track of blockers for resources when traversing
+2cb6d72 (#9671) Generated resources should not depend on the completed_ whit
+a5845b7 (#9671) Exit early from #eval_generate if nothing is created
+7002eff (#9617) Be smarter about finding parents when eval_generating
+11fda78 maint: Don't File#expand_path when unmunging file paths
+ad4316a (#9671) Use Array#concat rather than +=
+20260f3 maint: Correct the spelling of sentinel
+4f03384 (#10614) Detect when trying to managing ACLs on a non-ACL volume
+37b9f0f (#10614) Provide default metadata values for Windows ACLs
+1cb37c9 (#10614) Add method for detecting Windows volumes that support ACLs
+c9ee5a0 (#10614) Fix setting and clearing read-only attribute on Windows
+ed27a90 (#10614) Fix error checking for Windows BOOL return values
+7f0756d (#10727) Don't rely on Kernel#Pathname
+23379d0 (#10614) Detect when trying to managing ACLs on a non-ACL volume
+374fee5 (#10614) Provide default metadata values for Windows ACLs
+f60e889 (#10614) Add method for detecting Windows volumes that support ACLs
+1371dbd (#10614) Fix setting and clearing read-only attribute on Windows
+7eb0197 (#10614) Fix error checking for Windows BOOL return values
+9dfd011 (#5617)  Puppet queue logging
+0a34697 (#2744) Display file diffs through the Puppet log system.
+0c28238 (#9508) Be explicit is setting `auth any` for default ACLs.
+f140eca Updated CHANGELOG for 2.7.7rc1
+057cda6 (#9508) Default ACL of `auth any` makes sense where we had `auth no`
+78670ed (#9983) Checksum file in binary mode when storing to filebucket
+da11a78 (#9983) Serve file content in binary mode
+13f1054 (#9983) Read file content from disk using binary mode
+4b4bb8b (#9983) Use binary mode when reading and writing FileBucketFiles
+899833b (#9983) Read file content in binary mode when backing up
+dc8bcf8 (#9983) Restore files in binary mode
+489a679 (#9983) Checksum files in binary mode
+f7bfa05 (#9983) Add method for reading binary files
+674068a (#10269) Make directories executable so they can be cleaned up
+fd747cc (#10365) Add pending test when file overwrites an executable directory
+fe30d8f (#10315) Add pending tests when following symlinks
+a22c7aa Maint: Fix test breakage
+8576e86 (#10269) Search bit not set on newly created directories
+a91cfa1 maint: Fix failing spec on old version of rspec
+428e08c Stub File.open to not touch the disk
+aa2a762 (#10289) Add an ext script to upload facts to inventory server
+a97337f (#10346) Fix storeconfigs spec failures when run alone
+5129d38 (#10289) Add a safe alternative to REST for inventory service
+5c4daa4 (#7601) Use definition lists in indirection references
+7df46a2 (#7601) Use definition lists in type references
+ad97dc9 (#7601) Add markdown_definitionlist method to reference.rb
+455c9aa Maint: Revise reference text for most types and providers
+ced8e19 (#7601) Remove unnecessarily abstracted paramwrap method
+a6957ac (#7601) Rename "h" method to "markdown_header"
+7a0ade6 (#7601) Use << instead of += in references
+7d65796 (#9109) Retrieve request parameters from the request body for POSTs
+5a2952c (maint) Fix CA-related specs failing on Windows
+42fb76e Fix typo in report debug message
+eab5965 missing includes in network XML-RPC handlers
+7514d32 missing includes in network XML-RPC handlers
+614526a (#10244) Restore Mongrel XMLRPC functionality
+397a506 (#10244) Restore Mongrel XMLRPC functionality
+fcaf7c5 Updated CHANGELOG for 2.6.12
+f51d221 Improve the error message when a CSR is rejected
+d551747 Allow a master to bootstrap itself with dns_alt_names and autosign
+0405196 (maint) Remove ssl dir before starting a master with DNS alt names
+3ed6499 Backport Enumerable#count to Rubies < 1.8.7
+5f44c23 More 1.8.5 compatibility fixes.
+ef1b960 Better 1.8.5 compatible implementation of `lines`.
+246e875 (#2848) Config options require '_', not '-'.
+3bdeb3a Ruby 1.8.5 compatibility changes in tests and code.
+6866d4b Add `lines` alias for `each_line` in Ruby 1.8.5.
+2f9ec3c s/not_to/should_not/ for older versions of RSpec 2.
+56320ea (#2848) Eliminate redundant `master_dns_alt_names`.
+de19861 (#2848) Remove the legacy SSLCertificates code
+cf008a6 (#2848) Rework the xmlrpc CA handler to use the modern SSL code
+32be180 (#2848) Remove unused xmlrpc code
+5f2a44d (#2848) Consistent return values from `subject_alt_names` accessors.
+5e507f2 (#2848) Consistently use `subject_alt_names` as accessor name.
+5ac2417 (#2848) Don't strip the subjectAltName label when listing.
+44cf3a2 (#2848) Don't enable `emailProtection` for server keys.
+d66def9 (#2848) Only mark `subjectAltName` critical if `subject` is empty.
+8174047 (#2848) Migrate `dns-alt-names` back to settings.
+f18df2b Wire up the `setbycli` slot in Puppet settings.
+efa61f2 (#2848) rename subject-alt-name option to dns-alt-names
+f103b20 (#2848) Rename `certdnsnames` to match new behaviour.
+363b47b (#2848) Use `certdnsnames` when bootstrapping a local master.
+49334ff (#2848) CSR subjectAltNames handling while signing.
+5f2af93 (#2848) List subject alt names in output of puppet cert --list
+bb475ec (#7224) Add a helper to Puppet::SSL::Certificate to retrieve alternate names
+bab9310 (#2848) Rewrite SSL Certificate Factory, fixing `subjectAltName` leak.
+fca1ff0 (#2848) Reject unknown (== all) extensions on the CSR.
+443a756 (#2848) extract the subjectAltName value from the CSR.
+66101f1 (#2848) Set `certdnsnames` values into the CSR.
+77b814f (#6928) Don't blow up when the method is undefined...
+5427f1e (#6928) backport Symbol#to_proc for Ruby < 1.8.7
+6ef1d3a (#6371) Update lastchg field in shadow file on Solaris.
+c343615 (#10161) Parenthesize method arguments
+5721ab9 Maint: Remove duplicate path extension code
+edc721e (#9636) Always set $CHILD_STATUS when executing on Windows
+448d5db (#9636) Fix PATHEXT resolution for paths other than system32
+424379d (#9996) Restore functionality for multi-line commands in exec resources
+ad98d47 (#9831) Standardize Windows provider confining
+cf8fae2 (#9832) General StoreConfigs regression.
+1e8a2cd (#9607) Only validate package source when it is set or needed
+0258096 (#9461) Resolve executables using PATHEXT on Windows
+d78afda (#9938) Allow directory sticky-ness to be set
+23b4864 Maint: Document tag metaparameter's ability to take an array
+b3c0f1d Stub method for getting roles from the user provider
+006a128 Set vardir so that msi package provider runs on Windows
+4185b4e Add Windows-specific tests when user parameter specified in exec
+aab6b40 Disable mount provider tests on Windows
+58f97e3 Update test due to lack of 'true' on Windows
+1fd90c3 Change tests to not use 'mount' provider
+220f5e0 Added 'touch' method enabling tests to run on Windows
+ca0bc4f Change test to not call 'rm -rf'
+1883455 Remove 'fails_on_windows' tag for passing tests
+0d7c797 (#8414) Create scheduled_task type for use with Windows scheduled tasks
+4ddef89 (#8414) Require win32-taskscheduler gem on Windows
+0ecf3ab Add ability to look up fully qualified local accounts using Puppet::Util::Adsi.sid_for_account
+23d5aeb Add support for displaying hashes to Puppet::Parameter.format_value_for_display
+f0c3414 Move parameter formatting rules into helper method
+845e05b Wrap long lines in Type::Package
+18d65ec Whitespace cleanup in Type::SshAuthorizedKey
+b2e2175 Include necessary Facter stubs
+f5bc897 Remove test dependencies on QUANTITY of calls
+51adf31 Reset the @macosx_version_major variable
+4b9dfdd Reset the @job_list variable between tests
+446a5bf Remove use of defined?()
+0e4079d Use memoization instead of 'unless'
+9d504ff (#9796) ssh_authorized_key supports whitespace again
+122b8c2 (#9459) Fix problems with Windows 'user' and 'group' providers.
+ee107cf Use instance variable for job_list
+d1e0fa1 Refactor launchd provider spec tests
+3440c10 Refactor status method
+62b8d6b Deprecation Warning if using Facter <= 1.5.5
+8a50c3a Test prefetching
+f09d264 Stub call to Facter
+a6bc5a5 Optimize @product_version variable
+af42ff8 Documentation Commit
+55610bf Whitespace Commit
+cf3d378 Change method used to get Fact Value
+ce776b0 Revert launchd_spec
+f65b111 Rearrange launchd provider
+ed90957 First attempt at launchd spec
+637b57b Implement Caching
+60482f4 Whitespace and Alignment Commit
+5b52bd6 Bring up to date with topic branch
+27057a6 Maint: Fix the "provider" parameter documentation
+
 2.7.6 (includes CVE-2011-3872 see http://puppetlabs.com/security/hotfixes/cve-2011-3872/
 ===
 c09517a Improve the error message when a CSR is rejected

data/conf/auth.conf

@@ -75,21 +75,22 @@ path /file
 allow *
 
 ### Unauthenticated ACL, for clients for which the current master doesn't
-### have a valid certificate
+### have a valid certificate; we allow authenticated users, too, because
+### there isn't a great harm in letting that request through.
 
 # allow access to the master CA
 path /certificate/ca
-auth no
+auth any
 method find
 allow *
 
 path /certificate/
-auth no
+auth any
 method find
 allow *
 
 path /certificate_request
-auth no
+auth any
 method find, save
 allow *
 

data/conf/redhat/puppet.spec

@@ -5,13 +5,16 @@
 %global confdir conf/redhat
 
 Name:           puppet
-Version:        2.7.6
+Version:        2.7.8
+#Release:        0.1rc1%{?dist}
 Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
 URL:            http://puppetlabs.com
 Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
+#Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc1.tar.gz
 Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.asc
+#Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc1.tar.gz.asc
 
 Group:          System Environment/Base
 
@@ -282,6 +285,18 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Thu Dec 8 2011 Matthaus Litteken <matthaus@puppetlabs.com> - 2.7.8-1
+- Update for 2.7.8
+
+* Wed Nov 30 2011 Michael Stahnke <stahnma@puppetlabs.com> - 2.7.8-0.1rc1
+- Update for 2.7.8rc1
+
+* Mon Nov 21 2011 Michael Stahnke <stahnma@puppetlabs.com> - 2.7.7-1
+- Relaese 2.7.7
+
+* Tue Nov 01 2011 Michael Stahnke <stahnma@puppetlabs.com> - 2.7.7-0.1rc1
+- Update for 2.7.7rc1
+
 * Fri Oct 21 2011 Michael Stahnke <stahnma@puppetlabs.com> - 2.7.6-1
 - 2.7.6 final
 

data/conf/solaris/pkginfo

@@ -1,6 +1,6 @@
 PKG=CSWpuppet
 NAME=puppet - System Automation Framework
-VERSION=2.7.2
+VERSION=2.7.8
 CATEGORY=application
 VENDOR=http://projects.puppetlabs.com/projects/puppet
-EMAIL=luke@puppetlabs.com
+EMAIL=info@puppetlabs.com

data/conf/suse/puppet.spec

@@ -4,13 +4,13 @@
 
 Summary: A network tool for managing many disparate systems
 Name: puppet
-Version: 2.7.2
+Version: 2.7.8
 Release: 0.1rc1%{?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
+Source0: http://puppetlabs.com/downloads/puppet/%{name}-%{version}rc1.tar.gz
 
 PreReq: %{insserv_prereq} %{fillup_prereq}
 Requires: ruby >= 1.8.2
@@ -35,7 +35,7 @@ Provides the central puppet server daemon which provides manifests to clients.
 The server can also function as a certificate authority and file server.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}rc1
 
 %build
 for f in bin/* sbin/*; do
@@ -136,6 +136,12 @@ find %{buildroot}%{ruby_sitelibdir} -type f -perm +ugo+x -exec chmod a-x '{}' \;
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Wed Nov 30 2011 Michael Stahnke <stahnma@puppetlabs.com> - 2.7.8-0.1rc1
+- Update for 2.7.8rc1
+
+* Mon Nov 21 2011 Michael Stahnke <stahnma@puppetlabs.com> - 2.7.7-1
+- Release 2.7.7
+
 * Wed Jul 06 2011 Michael Stahnke <stahnma@puppetlabs.com> - 2.7.2-0.1rc1
 - Updating to 2.7.2rc1
 

data/ext/upload_facts.rb

@@ -0,0 +1,120 @@
+#!/usr/bin/env ruby
+
+require 'net/https'
+require 'openssl'
+require 'openssl/x509'
+require 'optparse'
+require 'pathname'
+require 'yaml'
+
+require 'puppet'
+require 'puppet/network/http_pool'
+
+class Puppet::Application::UploadFacts < Puppet::Application
+  should_parse_config
+  run_mode :master
+
+  option('--debug', '-d')
+  option('--verbose', '-v')
+
+  option('--logdest DEST', '-l DEST') do |arg|
+    Puppet::Util::Log.newdestination(arg)
+    options[:setdest] = true
+  end
+
+  option('--minutes MINUTES', '-m MINUTES') do |minutes|
+    options[:time_limit] = 60 * minutes.to_i
+  end
+
+  def help
+    print <<HELP
+== Synopsis
+
+Upload cached facts to the inventory service.
+
+= Usage
+
+  upload_facts [-d|--debug] [-v|--verbose] [-m|--minutes <minutes>]
+               [-l|--logdest syslog|<file>|console]
+
+= Description
+
+This command will read YAML facts from the puppet master's YAML directory, and
+save them to the configured facts_terminus. It is intended to be used with the
+facts_terminus set to inventory_service, in order to ensure facts which have
+been cached locally due to a temporary failure are still uploaded to the
+inventory service.
+
+= Usage Notes
+
+upload_facts is intended to be run from cron, with the facts_terminus set to
+inventory_service. The +--minutes+ argument should be set to the length of time
+between upload_facts runs. This will ensure that only new YAML files are
+uploaded.
+
+= Options
+
+Note that any configuration parameter 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.
+
+See the configuration file documentation at
+http://docs.puppetlabs.com/references/stable/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'.
+
+minutes::
+  Limit the upload only to YAML files which have been added within the last n
+  minutes.
+HELP
+
+    exit
+  end
+
+  def setup
+    # Handle the logging settings.
+    if options[:debug] or options[:verbose]
+      if options[:debug]
+        Puppet::Util::Log.level = :debug
+      else
+        Puppet::Util::Log.level = :info
+      end
+
+      Puppet::Util::Log.newdestination(:console) unless options[:setdest]
+    end
+
+    exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
+  end
+
+  def main
+    dir = Pathname.new(Puppet[:yamldir]) + 'facts'
+
+    cutoff = options[:time_limit] ? Time.now - options[:time_limit] : Time.at(0)
+
+    files = dir.children.select do |file|
+      file.extname == '.yaml' && file.mtime > cutoff
+    end
+
+    failed = false
+
+    terminus = Puppet::Node::Facts.indirection.terminus
+
+    files.each do |file|
+      facts = YAML.load_file(file)
+
+      request = Puppet::Indirector::Request.new(:facts, :save, facts)
+
+      # The terminus warns for us if we fail.
+      if terminus.save(request)
+        Puppet.info "Uploaded facts for #{facts.name} to inventory service"
+      else
+        failed = true
+      end
+    end
+
+    exit !failed
+  end
+end
+
+Puppet::Application::UploadFacts.new.run

data/install.rb

@@ -423,11 +423,17 @@ def install_binfile(from, op_file, target)
     if not installed_wrapper
       tmp_file2 = File.join(tmp_dir, '_tmp_wrapper')
       cwn = File.join(Config::CONFIG['bindir'], op_file)
-      regex_safe_ruby = Regexp.escape(ruby.gsub(%r{/}) { "\\" })
-      regex_safe_cwn = Regexp.escape(cwn.gsub(%r{/}) { "\\" })
-
-      cwv = CMD_WRAPPER.gsub('<ruby>', regex_safe_ruby).gsub('<command>', regex_safe_cwn)
-      File.open(tmp_file2, "wb") { |cw| cw.puts cwv }
+      cwv = <<-EOS
+@echo off
+if "%OS%"=="Windows_NT" goto WinNT
+#{ruby} -x "#{cwn}" %1 %2 %3 %4 %5 %6 %7 %8 %9
+goto done
+:WinNT
+#{ruby} -x "#{cwn}" %*
+goto done
+:done
+EOS
+      File.open(tmp_file2, "w") { |cw| cw.puts cwv }
       FileUtils.install(tmp_file2, File.join(target, "#{op_file}.bat"), :mode => 0755, :verbose => true)
 
       File.unlink(tmp_file2)
@@ -438,17 +444,6 @@ def install_binfile(from, op_file, target)
   File.unlink(tmp_file)
 end
 
-CMD_WRAPPER = <<-EOS
-@echo off
-if "%OS%"=="Windows_NT" goto WinNT
-<ruby> -x "<command>" %1 %2 %3 %4 %5 %6 %7 %8 %9
-goto done
-:WinNT
-<ruby> -x "<command>" %*
-goto done
-:done
-EOS
-
 check_prereqs
 prepare_installation
 

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.6'
+  PUPPETVERSION = '2.7.8'
 
   def Puppet.version
     PUPPETVERSION