puppet 3.8.7 → 4.0.0.rc1

data/CONTRIBUTING.md

@@ -7,6 +7,26 @@ get things working in your environment. There are a few guidelines that we
 need contributors to follow so that we can have a chance of keeping on
 top of things.
 
+## Puppet Core vs Modules
+
+New functionality is typically directed toward modules to provide a slimmer
+Puppet Core, reducing its surface area, and to allow greater freedom for
+module maintainers to ship releases at their own cadence, rather than
+being held to the cadence of Puppet releases. With Puppet 4's "all in one"
+packaging, a list of modules at specific versions will be packaged with the
+core so that popular types and providers will still be available as part of
+the "out of the box" experience.
+
+Generally, new types and new OS-specific providers for existing types should
+be added in modules. Exceptions would be things like new cross-OS providers
+and updates to existing core types.
+
+If you are unsure of whether your contribution should be implemented as a
+module or part of Puppet Core, you may visit
+[#puppet-dev on Freenode IRC](http://freenode.net) or ask on the
+[puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev)
+for advice.
+
 ## Getting Started
 
 * Make sure you have a [Jira account](http://tickets.puppetlabs.com)
@@ -53,7 +73,7 @@ top of things.
 For changes of a trivial nature to comments and documentation, it is not
 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.
+a ticket number. 
 
 ````
     (doc) Add documentation commit example to CONTRIBUTING
@@ -63,7 +83,7 @@ a ticket number.
     is left to assume how a commit of this nature may appear.
 
     The first line is a real life imperative statement with '(doc)' in
-    place of what would have been the ticket number in a
+    place of what would have been the ticket number in a 
     non-documentation related commit. The body describes the nature of
     the new documentation or comments added.
 ````
@@ -77,20 +97,15 @@ a ticket number.
   * Include a link to the pull request in the ticket.
 * The core team looks at Pull Requests on a regular basis in a weekly triage
   meeting that we hold in a public Google Hangout. The hangout is announced in
-  the weekly status updates that are sent to the puppet-dev list. Notes are
-  posted to the [Puppet Community community-triage
-  repo](https://github.com/puppet-community/community-triage/tree/master/core/notes)
-  and include a link to a YouTube recording of the hangout.
+  the weekly status updates that are sent to the puppet-dev list.
 * After feedback has been given we expect responses within two weeks. After two
-  weeks we may close the pull request if it isn't showing any activity.
+  weeks will may close the pull request if it isn't showing any activity.
 
 # Additional Resources
 
-* [Puppet Labs community guildelines](http://docs.puppetlabs.com/community/community_guidelines.html)
+* [More information on contributing](http://links.puppetlabs.com/contribute-to-puppet)
 * [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/)
-* #puppet-dev IRC channel on freenode.org ([Archive](https://botbot.me/freenode/puppet-dev/))
-* [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev)
-* [Community PR Triage notes](https://github.com/puppet-community/community-triage/tree/master/core/notes)
+* #puppet-dev IRC channel on freenode.org

data/Gemfile

@@ -23,61 +23,49 @@ platforms :ruby do
   #gem 'ruby-augeas', :group => :development
 end
 
-if !ENV['PUPPET_LOADED']
-  gem "puppet", :path => File.dirname(__FILE__), :require => false
-end
-gem "facter", *location_for(ENV['FACTER_LOCATION'] || ['> 1.6', '< 3'])
-gem "hiera", *location_for(ENV['HIERA_LOCATION'] || '~> 1.0')
+gem "puppet", :path => File.dirname(__FILE__), :require => false
+gem "facter", *location_for(ENV['FACTER_LOCATION'] || ['> 2.0', '< 4'])
+gem "hiera", *location_for(ENV['HIERA_LOCATION'] || ['> 1.0', '< 3'])
 gem "rake", "10.1.1", :require => false
 
 group(:development, :test) do
-  gem "rspec", "~> 2.14.0", :require => false
+  gem "rspec", "~> 3.1", :require => false
+  gem "rspec-its", "~> 1.1", :require => false
+  gem "rspec-collection_matchers", "~> 1.1", :require => false
+  gem "rspec-legacy_formatters", "~> 1.0", :require => false
 
   # Mocha is not compatible across minor version changes; because of this only
   # versions matching ~> 0.10.5 are supported. All other versions are unsupported
   # and can be expected to fail.
   gem "mocha", "~> 0.10.5", :require => false
 
-  gem "yarjuf", "~> 1.0"
+  gem "yarjuf", "~> 2.0"
 
   # json-schema does not support windows, so omit it from the platforms list
   # json-schema uses multi_json, but chokes with multi_json 1.7.9, so prefer 1.7.7
   gem "multi_json", "1.7.7", :require => false, :platforms => [:ruby, :jruby]
   gem "json-schema", "2.1.1", :require => false, :platforms => [:ruby, :jruby]
+
+  gem "rubocop", "~> 0.26.1", :platforms => [:ruby]
+
+  gem 'rdoc', "~> 4.1", :platforms => [:ruby]
 end
 
 group(:development) do
   if RUBY_PLATFORM != 'java'
-    case RUBY_VERSION
-    when /^1.8/
-      gem 'ruby-prof', "~> 0.13.1", :require => false
-    else
-      gem 'ruby-prof', :require => false
-    end
+    gem 'ruby-prof', :require => false
   end
 end
 
 group(:extra) do
   gem "rack", "~> 1.4", :require => false
-  gem "activerecord", '~> 3.2', :require => false
-  # this pin for i18n should *not* be in the puppet-4+ branches
-  # it's solely here because activerecord pulls in i18n and i18n
-  # was recently updated to require 1.9.3 which breaks 1.8.7 specs
-  gem "i18n", '~> 0.6.11', :require => false
-  gem "couchrest", '~> 1.0', :require => false
   gem "net-ssh", '~> 2.1', :require => false
   gem "puppetlabs_spec_helper", :require => false
-  # rest-client is used only by couchrest, so when
-  # that dependency goes away, this one can also
-  gem "rest-client", '1.6.7', :require => false
-  gem "stomp", :require => false
   gem "tzinfo", :require => false
   case RUBY_PLATFORM
   when 'java'
-    gem "jdbc-sqlite3", :require => false
     gem "msgpack-jruby", :require => false
   else
-    gem "sqlite3", :require => false
     gem "msgpack", :require => false
   end
 end

data/LICENSE

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

data/Rakefile

@@ -66,3 +66,12 @@ end
 task :spec do
   sh %{rspec #{ENV['TEST'] || ENV['TESTS'] || 'spec'}}
 end
+
+desc 'run static analysis with rubocop'
+task(:rubocop) do
+  require 'rubocop'
+  cli = RuboCop::CLI.new
+  exit_code = cli.run(%w(--display-cop-names --format simple))
+  raise "RuboCop detected offenses" if exit_code != 0
+end
+

data/bin/puppet

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 
-# For security reasons, ensure that '.' is not on the load path
-# This is primarily for 1.8.7 since 1.9.2+ doesn't put '.' on the load path
-$LOAD_PATH.delete '.'
-
-require 'puppet/util/command_line'
-Puppet::Util::CommandLine.new.execute
+begin
+  require 'puppet/util/command_line'
+  Puppet::Util::CommandLine.new.execute
+rescue LoadError => e
+  $stderr.puts e.message
+  exit(1)
+end

data/conf/auth.conf

@@ -37,18 +37,18 @@
 #
 # Examples:
 #
-# path ~ ^/path/to/resource    # Equivalent to `path /path/to/resource`.
-# allow *                      # Allow all authenticated nodes (since auth
-#                              # defaults to `yes`).
+# path ~ ^/puppet/v3/path/to/resource    # Equivalent to `path /puppet/v3/path/to/resource`.
+# allow *                                # Allow all authenticated nodes (since auth
+#                                        # defaults to `yes`).
 #
-# path ~ ^/catalog/([^/]+)$    # Permit nodes to access their own catalog (by
-# allow $1                     # certname), but not any other node's catalog.
+# path ~ ^/puppet/v3/catalog/([^/]+)$    # Permit nodes to access their own catalog (by
+# allow $1                               # certname), but not any other node's catalog.
 #
-# path ~ ^/file_(metadata|content)/extra_files/  # Only allow certain nodes to
-# auth yes                                       # access the "extra_files"
-# allow /^(.+)\.example\.com$/                   # mount point; note this must
-# allow_ip 192.168.100.0/24                      # go ABOVE the "/file" rule,
-#                                                # since it is more specific.
+# path ~ ^/puppet/v3/file_(metadata|content)/extra_files/  # Only allow certain nodes to
+# auth yes                                                 # access the "extra_files"
+# allow /^(.+)\.example\.com$/                             # mount point; note this must
+# allow_ip 192.168.100.0/24                                # go ABOVE the "/file" rule,
+#                                                          # since it is more specific.
 #
 # environment:: restrict an ACL to a comma-separated list of environments
 # method:: restrict an ACL to a comma-separated list of HTTP methods
@@ -60,23 +60,22 @@
 ### Authenticated ACLs - these rules apply only when the client
 ### has a valid certificate and is thus authenticated
 
+path /puppet/v3/environments
+method find
+allow *
+
 # allow nodes to retrieve their own catalog
-path ~ ^/catalog/([^/]+)$
+path ~ ^/puppet/v3/catalog/([^/]+)$
 method find
 allow $1
 
 # allow nodes to retrieve their own node definition
-path ~ ^/node/([^/]+)$
+path ~ ^/puppet/v3/node/([^/]+)$
 method find
 allow $1
 
-# allow all nodes to access the certificates services
-path /certificate_revocation_list/ca
-method find
-allow *
-
 # allow all nodes to store their own reports
-path ~ ^/report/([^/]+)$
+path ~ ^/puppet/v3/report/([^/]+)$
 method save
 allow $1
 
@@ -85,7 +84,16 @@ allow $1
 # mount points (see fileserver.conf). Note that the `/file` prefix matches
 # requests to both the file_metadata and file_content paths. See "Examples"
 # above if you need more granular access control for custom mount points.
-path /file
+path /puppet/v3/file
+allow *
+
+path /puppet/v3/status
+method find
+allow *
+
+# allow all nodes to access the certificates services
+path /puppet-ca/v1/certificate_revocation_list/ca
+method find
 allow *
 
 ### Unauthenticated ACLs, for clients without valid certificates; authenticated
@@ -93,27 +101,23 @@ allow *
 
 # allow access to the CA certificate; unauthenticated nodes need this
 # in order to validate the puppet master's certificate
-path /certificate/ca
+path /puppet-ca/v1/certificate/ca
 auth any
 method find
 allow *
 
 # allow nodes to retrieve the certificate they requested earlier
-path /certificate/
+path /puppet-ca/v1/certificate/
 auth any
 method find
 allow *
 
 # allow nodes to request a new certificate
-path /certificate_request
+path /puppet-ca/v1/certificate_request
 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/conf/environment.conf

@@ -0,0 +1,16 @@
+# Each environment can have an environment.conf file. Its settings will only
+# affect its own environment. See docs for more info:
+# https://docs.puppetlabs.com/puppet/latest/reference/config_file_environment.html
+
+# Any unspecified settings use default values; some of those defaults are based
+# on puppet.conf settings.
+
+# If these settings include relative file paths, they'll be resolved relative to
+# this environment's directory.
+
+# Allowed settings and default values:
+
+# modulepath = ./modules:$basemodulepath
+# manifest = (default_manifest from puppet.conf; defaults to ./manifests)
+# config_version = (no script; Puppet will use the time the catalog was compiled)
+# environment_timeout = (environment_timeout from puppet.conf; defaults to unlimited)

data/conf/fileserver.conf

@@ -11,10 +11,10 @@
 # you must create a static mount point in this file:
 #
 # [extra_files]
-#   path /etc/puppet/files
+#   path /etc/puppetlabs/puppet/files
 #   allow *
 #
-# In the example above, anything in /etc/puppet/files/<file name> would be
+# In the example above, anything in /etc/puppetlabs/puppet/files/<file name> would be
 # available to authenticated nodes at puppet:///extra_files/<file name>.
 #
 # Mount points may also use three placeholders as part of their path:

data/conf/puppet.conf

@@ -0,0 +1,6 @@
+# This file can be used to override the default puppet settings.
+# See the following links for more details on what settings are available:
+# - https://docs.puppetlabs.com/puppet/latest/reference/config_important_settings.html
+# - https://docs.puppetlabs.com/puppet/latest/reference/config_about_settings.html
+# - https://docs.puppetlabs.com/puppet/latest/reference/config_file_main.html
+# - https://docs.puppetlabs.com/references/latest/configuration.html

data/ext/README.environment

@@ -1,7 +1,7 @@
 This is an example environment directory. The environment's modules can be
 placed in a "modules" subdirectory. The environments initial manifests are
 placed in a "manifests" subdirectory. By default the environment also has any
-modules that are installed globally (normally in /etc/puppet/modules) for the
+modules that are installed globally (normally in /etc/puppetlabs/code/modules) for the
 puppet master.
 
 For more information see

data/ext/build_defaults.yaml

@@ -2,34 +2,43 @@
 packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
 packaging_repo: 'packaging'
 default_cow: 'base-squeeze-i386.cow'
-cows: 'base-precise-i386.cow base-squeeze-i386.cow base-trusty-i386.cow base-wheezy-i386.cow'
+cows: 'base-lucid-i386.cow base-precise-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-trusty-i386.cow base-wheezy-i386.cow'
 pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
 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-el-7-x86_64'
+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
 build_dmg: TRUE
+msi_name: 'puppet-agent'
 build_msi:
   puppet_for_the_win:
-    ref: 'refs/tags/3.8.3'
+    ref: '52e81967253924428bb0b1e7e1a11e8678d68378'
     repo: 'git://github.com/puppetlabs/puppet_for_the_win.git'
   facter:
-    ref: 'refs/tags/2.4.5'
+    ref: 'refs/tags/2.4.0'
     repo: 'git://github.com/puppetlabs/facter.git'
+  cfacter:
+    archive:
+      x86: 'cfacter-0.3.0-x86.zip'
+      x64: 'cfacter-0.3.0-x64.zip'
+    path: 'http://builds.puppetlabs.lan/cfacter/0.3.0/artifacts/windows'
   hiera:
     ref: 'refs/tags/1.3.4'
     repo: 'git://github.com/puppetlabs/hiera.git'
+  mcollective:
+    ref: 'refs/tags/2.7.0'
+    repo: 'git://github.com/puppetlabs/marionette-collective.git'
   sys:
     ref:
-      x86: 'refs/tags/1.9.3-p551.10'
-      x64: 'refs/tags/2.0.0.13-x64'
+      x86: 'aac9e790c9c3e59175e9d528f8aa517bb6caed76'
+      x64: '9e70b6ac8474678487f4330fecc2179158ae62f3'
     repo: 'git://github.com/puppetlabs/puppet-win32-ruby.git'
-apt_signing_server: 'apt.puppetlabs.com'
+apt_host: 'apt.puppetlabs.com'
 apt_repo_url: 'http://apt.puppetlabs.com'
 apt_repo_path: '/opt/repository/incoming'
 ips_repo: '/var/pkgrepo'

data/ext/debian/control

@@ -11,9 +11,9 @@ Homepage: http://projects.puppetlabs.com/projects/puppet
 
 Package: puppet-common
 Architecture: all
-Depends: ${misc:Depends}, ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.9.1 | libruby (>= 1:1.9.3.4), 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), libjson-ruby | ruby-json
+Depends: ${misc:Depends}, ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.9.1 | libruby (>= 1:1.9.3.4), ruby-shadow | libshadow-ruby1.8, libaugeas-ruby | libaugeas-ruby1.9.1 | libaugeas-ruby1.8, lsb-base, sysv-rc (>= 2.86) | file-rc, hiera (>= 1.0.0), facter (>= 1.7.0), libjson-ruby | ruby-json
 Recommends: lsb-release, debconf-utils
-Suggests: ruby-selinux | libselinux-ruby1.8, librrd-ruby1.9.1 | librrd-ruby1.8
+Suggests: ruby-selinux | libselinux-ruby1.8
 Breaks: puppet (<< 2.6.0~rc2-1), puppetmaster (<< 0.25.4-1)
 Provides: hiera-puppet
 Conflicts: hiera-puppet, puppet (<< 3.3.0-1puppetlabs1)
@@ -61,7 +61,7 @@ Depends: ${misc:Depends}, ruby | ruby-interpreter, puppet-common (= ${binary:Ver
 Breaks: puppet (<< 0.24.7-1), puppetmaster (<< 2.6.1~rc2-1)
 Replaces: puppetmaster (<< 2.6.1~rc2-1)
 Conflicts: puppet-common (<< 3.3.0-1puppetlabs1)
-Suggests: apache2 | nginx, puppet-el, vim-puppet, stompserver, ruby-stomp | libstomp-ruby1.8,
+Suggests: apache2 | nginx, puppet-el, vim-puppet,
  rdoc, ruby-ldap | libldap-ruby1.8, puppetdb-terminus
 Description: Puppet master common scripts
  This package contains common scripts for the puppet master,
@@ -83,7 +83,7 @@ Architecture: all
 Depends: ${misc:Depends}, ruby | ruby-interpreter, puppetmaster-common (= ${source:Version}), facter (>= 1.7.0), lsb-base
 Breaks: puppet (<< 0.24.7-1)
 Conflicts: puppet (<< 3.3.0-1puppetlabs1)
-Suggests: apache2 | nginx, puppet-el, vim-puppet, stompserver, ruby-stomp | libstomp-ruby1.8,
+Suggests: apache2 | nginx, puppet-el, vim-puppet,
  rdoc, ruby-ldap | libldap-ruby1.8, puppetdb-terminus
 Description: Centralized configuration management - master startup and compatibility scripts
  This package contains the startup and compatibility scripts for the puppet
@@ -139,7 +139,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.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
+Depends: ${misc:Depends}, ruby | ruby-interpreter, puppet-common (= ${source:Version}), facter (>= 1.7.0), lsb-base, 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/debian/puppet-common.manpages

@@ -17,9 +17,6 @@ man/man8/puppet-file.8
 man/man8/puppet-filebucket.8
 man/man8/puppet-help.8
 man/man8/puppet-inspect.8
-man/man8/puppet-instrumentation_data.8
-man/man8/puppet-instrumentation_listener.8
-man/man8/puppet-instrumentation_probe.8
 man/man8/puppet-key.8
 man/man8/puppet-kick.8
 man/man8/puppet-man.8
@@ -27,9 +24,7 @@ man/man8/puppet-module.8
 man/man8/puppet-node.8
 man/man8/puppet-parser.8
 man/man8/puppet-plugin.8
-man/man8/puppet-queue.8
 man/man8/puppet-report.8
 man/man8/puppet-resource.8
 man/man8/puppet-resource_type.8
-man/man8/puppet-secret_agent.8
 man/man8/puppet-status.8