puppet 4.0.0 → 4.9.1

data/COMMITTERS.md

@@ -8,7 +8,7 @@ branch, however, we maintain more than one active branch.  As a result
 contributors should target their changes at the master branch. This makes the
 process of contributing a little easier for the contributor since they don't
 need to concern themselves with the question, "What branch do I base my changes
-on?"  This is already called out in the [CONTRIBUTING.md](http://goo.gl/XRH2J).
+on?"  This is already called out in the [CONTRIBUTING.md](https://goo.gl/XRH2J).
 
 Therefore, it is the responsibility of the committer to re-base the change set
 on the appropriate branch which should receive the contribution.
@@ -16,7 +16,7 @@ on the appropriate branch which should receive the contribution.
 It is also the responsibility of the committer to review the change set in an
 effort to make sure the end users must opt-in to new behavior that is
 incompatible with previous behavior.  We employ the use of [feature
-flags](http://stackoverflow.com/questions/7707383/what-is-a-feature-flag) as
+flags](https://stackoverflow.com/questions/7707383/what-is-a-feature-flag) as
 the primary way to achieve this user opt-in behavior.  Finally, it is the
 responsibility of the committer to make sure the `master` and `stable` branches
 are both clean and working at all times.  Clean means that dead code is not

data/CONTRIBUTING.md

@@ -1,8 +1,8 @@
 # How to contribute
 
-Third-party patches are essential for keeping puppet great. We simply can't
+Third-party patches are essential for keeping Puppet great. We simply can't
 access the huge number of platforms and myriad configurations for running
-puppet. We want to keep it as easy as possible to contribute changes that
+Puppet. We want to keep it as easy as possible to contribute changes that
 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.
@@ -23,13 +23,13 @@ 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 on Freenode IRC](https://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)
+* Make sure you have a [Jira account](https://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.
@@ -90,7 +90,7 @@ a ticket number.
 
 ## Submitting Changes
 
-* Sign the [Contributor License Agreement](http://links.puppetlabs.com/cla).
+* Sign the [Contributor License Agreement](http://links.puppet.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 Jira ticket to mark that you have submitted code and are ready for it to be reviewed (Status: Ready for Merge).
@@ -104,13 +104,37 @@ a ticket number.
 * 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.
 
+## Revert Policy
+By running tests in advance and by engaging with peer review for prospective
+changes, your contributions have a high probability of becoming long lived
+parts of the the project. After being merged, the code will run through a
+series of testing pipelines on a large number of operating system
+environments. These pipelines can reveal incompatibilities that are difficult
+to detect in advance.
+
+If the code change results in a test failure, we will make our best effort to
+correct the error. If a fix cannot be determined and committed within 24 hours
+of its discovery, the commit(s) responsible _may_ be reverted, at the
+discretion of the committer and Puppet maintainers. This action would be taken
+to help maintain passing states in our testing pipelines.
+
+The original contributor will be notified of the revert in the Jira ticket
+associated with the change. A reference to the test(s) and operating system(s)
+that failed as a result of the code change will also be added to the Jira
+ticket. This test(s) should be used to check future submissions of the code to
+ensure the issue has been resolved.
+
+### Summary
+* Changes resulting in test pipeline failures will be reverted if they cannot
+  be resolved within one business day.
+
 # Additional Resources
 
-* [Puppet Labs community guildelines](http://docs.puppetlabs.com/community/community_guidelines.html)
-* [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 community guidelines](https://docs.puppet.com/community/community_guidelines.html)
+* [Bug tracker (Jira)](https://tickets.puppetlabs.com)
+* [Contributor License Agreement](http://links.puppet.com/cla)
+* [General GitHub documentation](https://help.github.com/)
+* [GitHub pull request documentation](https://help.github.com/articles/creating-a-pull-request/)
 * #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)

data/Gemfile

@@ -25,8 +25,16 @@ end
 
 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'] || ['>= 2.0', '< 3'])
+gem "hiera", *location_for(ENV['HIERA_LOCATION'] || ['>= 2.0', '< 4'])
+# PUP-7115 - return to a gem dependency in Puppet 5
+# gem "semantic_puppet", *location_for(ENV['SEMANTIC_PUPPET_LOCATION'] || ['>= 0.1.3', '< 2'])
 gem "rake", "10.1.1", :require => false
+# Hiera has an unbound dependency on json_pure
+# json_pure 2.0.2+ officially requires Ruby >= 2.0, but should have specified that in 2.0
+gem 'json_pure', '~> 1.8', :require => false
+# i18n support (gettext-setup and dependencies)
+gem 'gettext-setup', '>= 0.10', '< 1.0', :require => false
+gem 'locale', '~> 2.1', :require => false
 
 group(:development, :test) do
   gem "rspec", "~> 3.1", :require => false
@@ -46,9 +54,16 @@ group(:development, :test) do
   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 "rubocop", "~> 0.39.0", :platforms => [:ruby]
 
   gem 'rdoc', "~> 4.1", :platforms => [:ruby]
+
+  # webmock requires addressable as as of 2.5.0 addressable started
+  # requiring the public_suffix gem which requires Ruby 2
+  gem 'addressable', '< 2.5.0'
+  gem 'webmock', '~> 1.24'
+  gem 'vcr', '~> 2.9'
+  gem "hocon", :require => false
 end
 
 group(:development) do
@@ -62,12 +77,7 @@ group(:extra) do
   gem "net-ssh", '~> 2.1', :require => false
   gem "puppetlabs_spec_helper", :require => false
   gem "tzinfo", :require => false
-  case RUBY_PLATFORM
-  when 'java'
-    gem "msgpack-jruby", :require => false
-  else
-    gem "msgpack", :require => false
-  end
+  gem "msgpack", :require => false
 end
 
 require 'yaml'
@@ -79,10 +89,16 @@ data['gem_platform_dependencies'].each_pair do |gem_platform, info|
   next if gem_platform == 'x64-mingw32' && !x64_platform
   if bundle_deps = info['gem_runtime_dependencies']
     bundle_platform = bundle_platforms[gem_platform] or raise "Missing bundle_platform"
-    platform(bundle_platform.intern) do
+    if bundle_platform == "all"
       bundle_deps.each_pair do |name, version|
         gem(name, version, :require => false)
       end
+    else
+      platform(bundle_platform.intern) do
+        bundle_deps.each_pair do |name, version|
+          gem(name, version, :require => false)
+        end
+      end
     end
   end
 end

data/LICENSE

@@ -1,14 +1,14 @@
    Puppet - Automating Configuration Management.
 
-   Copyright (C) 2005-2015 Puppet Labs Inc
+   Copyright (C) 2005-2016 Puppet, Inc.
 
-   Puppet Labs can be contacted at: info@puppetlabs.com
+   Puppet, Inc. can be contacted at: info@puppet.com
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,

data/MAINTAINERS

@@ -0,0 +1,71 @@
+{
+  "version": 1,
+  "file_format": "This MAINTAINERS file format is described at https://github.com/puppetlabs/maintainers",
+  "issues": "https://tickets.puppet.com/browse/PUP",
+  "internal_list": "https://groups.google.com/a/puppet.com/forum/?hl=en#!forum/discuss-puppet-maintainers",
+  "people": [
+    {
+      "github": "hlindberg",
+      "email": "henrik.lindberg@puppet.com",
+      "name": "Henrik Lindberg"
+    },
+    {
+      "github": "joshcooper",
+      "email": "josh@puppet.com",
+      "name": "Josh Cooper"
+    },
+    {
+      "github": "MikaelSmith",
+      "email": "michael.smith@puppet.com",
+      "name": "Michael Smith"
+    },
+    {
+      "github": "thallgren",
+      "email": "thomas.hallgren@puppet.com",
+      "name": "Thomas Hallgren"
+    },
+    {
+      "github": "branan",
+      "email": "branan@puppet.com",
+      "name": "Branan Riley"
+    },
+    {
+      "github": "whopper",
+      "email": "whopper@puppet.com",
+      "name": "Will Hopper"
+    },
+    {
+      "github": "Iristyle",
+      "name": "Ethan J. Brown"
+    },
+    {
+      "github": "HAIL9000",
+      "email": "hailee@puppet.com",
+      "name": "Hailee Kenney"
+    },
+    {
+      "github": "er0ck",
+      "email": "eric.thompson@puppet.com",
+      "name": "Eric Thompson"
+    },
+    {
+      "github": "johnduarte",
+      "email": "john.duarte@puppet.com",
+      "name": "John Duarte"
+    },
+    {
+      "github": "adrienthebo",
+      "name": "Adrien Thebo"
+    },
+    {
+      "github": "jtappa",
+      "email": "jorie@puppet.com",
+      "name": "Jorie Tappa"
+    },
+    {
+      "github": "MosesMendoza",
+      "email": "moses@puppet.com",
+      "name": "Moses Mendoza"
+    }
+  ]
+}

data/README.md

@@ -2,7 +2,7 @@ Puppet
 ======
 
 [![Build Status](https://travis-ci.org/puppetlabs/puppet.png?branch=master)](https://travis-ci.org/puppetlabs/puppet)
-[![Inline docs](http://inch-ci.org/github/puppetlabs/puppet.png)](http://inch-ci.org/github/puppetlabs/puppet)
+[![Inline docs](https://inch-ci.org/github/puppetlabs/puppet.png)](https://inch-ci.org/github/puppetlabs/puppet)
 
 Puppet, an automated administrative engine for your Linux, Unix, and Windows systems, performs
 administrative tasks (such as adding users, installing packages, and updating server
@@ -12,24 +12,24 @@ Documentation
 -------------
 
 Documentation for Puppet and related projects can be found online at the
-[Puppet Docs site](http://docs.puppetlabs.com).
+[Puppet Docs site](https://docs.puppetlabs.com).
 
 HTTP API
 --------
-[HTTP API Index](api/docs/http_api_index.md)
+[HTTP API Index](https://docs.puppetlabs.com/puppet/latest/reference/http_api/http_api_index.html)
 
 Installation
 ------------
 
-The best way to run Puppet is with [Puppet Enterprise](http://puppetlabs.com/puppet/puppet-enterprise),
+The best way to run Puppet is with [Puppet Enterprise](https://puppetlabs.com/puppet/puppet-enterprise),
 which also includes orchestration features, a web console, and professional support.
-[The PE documentation is available here.](http://docs.puppetlabs.com/pe/latest)
+[The PE documentation is available here.](https://docs.puppetlabs.com/pe/latest)
 
 To install an open source release of Puppet,
-[see the installation guide on the docs site.](http://docs.puppetlabs.com/guides/installation.html)
+[see the installation guide on the docs site.](http://docs.puppetlabs.com/puppet/latest/reference/install_pre.html)
 
 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)
+[see the running from source guide on the docs site.](https://docs.puppetlabs.com/guides/from_source.html)
 
 Developing and Contributing
 ------
@@ -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.
@@ -64,7 +64,6 @@ 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.
@@ -72,5 +71,4 @@ 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)
-
+[Puppet Enterprise Support Lifecycle](https://puppetlabs.com/misc/puppet-enterprise-lifecycle)

data/Rakefile

@@ -75,3 +75,32 @@ task(:rubocop) do
   raise "RuboCop detected offenses" if exit_code != 0
 end
 
+desc "verify that commit messages match CONTRIBUTING.md requirements"
+task(:commits) do
+  # This rake task looks at the summary from every commit from this branch not
+  # in the branch targeted for a PR. This is accomplished by using the
+  # TRAVIS_COMMIT_RANGE environment variable, which is present in travis CI and
+  # populated with the range of commits the PR contains. If not available, this
+  # falls back to `master..HEAD` as a next best bet as `master` is unlikely to
+  # ever be absent.
+  commit_range = ENV['TRAVIS_COMMIT_RANGE'].nil? ? 'master..HEAD' : ENV['TRAVIS_COMMIT_RANGE'].sub(/\.\.\./, '..')
+  puts "Checking commits #{commit_range}"
+  %x{git log --no-merges --pretty=%s #{commit_range}}.each_line do |commit_summary|
+    # This regex tests for the currently supported commit summary tokens: maint, doc, packaging, or pup-<number>.
+    # The exception tries to explain it in more full.
+    if /^\((maint|doc|docs|packaging|pup-\d+)\)|revert/i.match(commit_summary).nil?
+      raise "\n\n\n\tThis commit summary didn't match CONTRIBUTING.md guidelines:\n" \
+        "\n\t\t#{commit_summary}\n" \
+        "\tThe commit summary (i.e. the first line of the commit message) should start with one of:\n"  \
+        "\t\t(pup-<digits>) # this is most common and should be a ticket at tickets.puppetlabs.com\n" \
+        "\t\t(docs)\n" \
+        "\t\t(maint)\n" \
+        "\t\t(packaging)\n" \
+        "\n\tThis test for the commit summary is case-insensitive.\n\n\n"
+    else
+      puts "#{commit_summary}"
+    end
+    puts "...passed"
+  end
+end
+

data/conf/auth.conf

@@ -7,8 +7,8 @@
 # otherwise, the general rules may "steal" requests that should be
 # governed by the specific rules.
 #
-# See http://docs.puppetlabs.com/guides/rest_auth_conf.html for a more complete
-# description of auth.conf's behavior.
+# See https://docs.puppetlabs.com/puppet/latest/reference/config_file_auth.html
+# for a more complete description of auth.conf's behavior.
 #
 # Supported syntax:
 # Each stanza in auth.conf starts with a path to match, followed

data/conf/puppet.conf

@@ -3,4 +3,4 @@
 # - 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
+# - https://docs.puppetlabs.com/puppet/latest/reference/configuration.html

data/ext/README.environment

@@ -5,4 +5,4 @@ modules that are installed globally (normally in /etc/puppetlabs/code/modules) f
 puppet master.
 
 For more information see
-http://docs.puppetlabs.com/puppet/latest/reference/environments.html
+https://docs.puppet.com/puppet/latest/reference/environments.html

data/ext/build_defaults.yaml

@@ -1,47 +1,20 @@
 ---
 packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
 packaging_repo: 'packaging'
-default_cow: 'base-squeeze-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'
+gpg_key: '7F438280EF8D349F'
+
+# These are the build targets used by the packaging repo. Uncomment to allow use.
+#final_mocks: 'pl-el-5-i386 pl-el-6-i386 pl-el-7-x86_64'
+#cows: 'base-lucid-i386.cow base-precise-i386.cow base-squeeze-i386.cow base-trusty-i386.cow base-wheezy-i386.cow'
+pbuild_conf: '/etc/pbuilderrc'
+
+build_gem: TRUE
+build_dmg: FALSE
 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 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: '52e81967253924428bb0b1e7e1a11e8678d68378'
-    repo: 'git://github.com/puppetlabs/puppet_for_the_win.git'
-  facter:
-    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/2.0.0'
-    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: '8db9d84da9950760144b5dfcd807213eecee4842'
-      x64: '12030f11e9bb2f085c68108bff34be6956b25df9'
-    repo: 'git://github.com/puppetlabs/puppet-win32-ruby.git'
-apt_host: 'apt.puppetlabs.com'
+apt_signing_server: 'apt.puppetlabs.com'
 apt_repo_url: 'http://apt.puppetlabs.com'
 apt_repo_path: '/opt/repository/incoming'
-ips_repo: '/var/pkgrepo'
-ips_store: '/opt/repository'
-ips_host: 'solaris-11-ips-repo.acctest.dc1.puppetlabs.net'
 tar_host: 'downloads.puppetlabs.com'

data/ext/debian/README.source

@@ -1,2 +1,2 @@
 The debian directory is now maintained on Alioth in git. 
-See http://pkg-puppet.alioth.debian.org/ for more information.
+See https://pkg-puppet.alioth.debian.org/ for more information.

data/ext/debian/control

@@ -7,7 +7,7 @@ Build-Depends-Indep: ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1
 Build-Depends: debhelper (>= 7.0.0), openssl
 Standards-Version: 3.9.1
 Vcs-Git: git://github.com/puppetlabs/puppet
-Homepage: http://projects.puppetlabs.com/projects/puppet
+Homepage: https://puppetlabs.com/puppet/puppet-open-source
 
 Package: puppet-common
 Architecture: all
@@ -123,17 +123,15 @@ Description: Centralised configuration management - master setup to run under mo
 
 Package: vim-puppet
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, puppet (= ${source:Version})
 Recommends: vim-addon-manager
-Conflicts: puppet (<< ${source:Version})
 Description: syntax highlighting for puppet manifests in vim
  The vim-puppet package provides filetype detection and syntax highlighting for
  puppet manifests (files ending with ".pp").
 
 Package: puppet-el
 Architecture: all
-Depends: ${misc:Depends}, emacsen-common
-Conflicts: puppet (<< ${source:Version})
+Depends: ${misc:Depends}, emacsen-common, puppet (= ${source:Version})
 Description: syntax highlighting for puppet manifests in emacs
  The puppet-el package provides syntax highlighting for puppet manifests
 

data/ext/debian/copyright

@@ -7,9 +7,9 @@ Maintainer:
  Nigel Kersten <nigel@explanatorygap.net>,
  Stig Sandbeck Mathisen <ssm@debian.org>
 Source: git://github.com/puppetlabs/puppet.git,
- http://puppetlabs.com/trac/puppet/wiki/DownloadingPuppet
+ https://docs.puppetlabs.com/puppet/latest/reference/install_pre.html
 
-Copyright: 2005-2011 Puppet Labs, LLC
+Copyright: 2005-2015 Puppet Labs
 License: Apache 2.0
 
 Files: debian/*
@@ -35,7 +35,7 @@ Files: lib/puppet/util/rdoc/generators/template/puppet/puppet.rb
 Copyright: The FaerieMUD Consortium.
 License: CC-BY-1.0
  This work is licensed under the Creative Commons Attribution License. To view
- a copy of this license, visit http://creativecommons.org/licenses/by/1.0/ or
+ a copy of this license, visit https://creativecommons.org/licenses/by/1.0/ or
  send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California
  94305, USA.
 
@@ -46,7 +46,7 @@ License: Apache
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
  .
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
  .
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,

data/ext/debian/puppet.default

@@ -1,9 +1,4 @@
 # Defaults for puppet - sourced by /etc/init.d/puppet
 
-# Enable puppet agent service?
-# Setting this to "yes" allows the puppet agent service to run.
-# Setting this to "no" keeps the puppet agent service from running.
-START=no
-
 # Startup options
 DAEMON_OPTS=""

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"
@@ -22,26 +21,12 @@ test -x $DAEMON || exit 0
 
 . /lib/lsb/init-functions
 
-is_true() {
-    if [ "x$1" = "xtrue" -o "x$1" = "xyes" -o "x$1" = "x0" ] ; then
-       return 0
-    else
-        return 1
-    fi
-}
-
 reload_puppet_agent() {
     start-stop-daemon --stop --quiet --signal HUP --pidfile $PIDFILE --name $PROCNAME
 }
 
 start_puppet_agent() {
-    if is_true "$START" ; then
-        start-stop-daemon --start --quiet --pidfile $PIDFILE \
-          --startas $DAEMON -- $NAME $DAEMON_OPTS
-    else
-        echo ""
-        echo "puppet not configured to start, please edit /etc/default/puppet to enable"
-    fi
+    start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON -- $NAME $DAEMON_OPTS
 }
 
 stop_puppet_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/debian/puppetmaster.README.debian

@@ -1,15 +1,17 @@
 By default, the puppetmaster package is configured in
-/etc/default/puppetmaster to utilize the webrick server included in
-the application. This server is single-threaded, very slow and tends
+/etc/default/puppetmaster to use the WEBrick server included in
+the application. This server is single-threaded, very slow, and tends
 to fall over when you get close to 30 nodes. You will start to see
 connection-reset or End-of-file errors when this happens.
 
-You will want to a server that can scale better than webrick, such as
-Passenger (aka. mod_rails), with a front-end web-proxy such as apache.
+For production deployments, use a server that can scale better than WEBrick,
+such as Passenger (aka mod_rails), with a front-end web-proxy such as Apache.
 
-If you would like to run Passenger (aka. mod_rails) with apache install the
-puppetmaster-passenger package. It will automatically setup an apache2 virtual
-host that will run puppetmaster under Passenger.
+To run Passenger with Apache, install the puppetmaster-passenger package. It
+automatically sets up an apache2 virtual host that runs puppetmaster under
+Passenger.
 
-For more information:
-http://projects.puppetlabs.com/projects/puppet/wiki/Using_Passenger
+For more information, see https://docs.puppetlabs.com/guides/passenger.html.
+For information about the Puppet-designed Puppet Server, which deprecates
+the Passenger/Apache stack, see
+https://docs.puppetlabs.com/puppetserver/latest/.

data/ext/emacs/puppet-mode.el

@@ -18,7 +18,7 @@
 ;; use this file except in compliance with the License.  You may obtain a copy
 ;; of the License at
 ;;
-;;     http://www.apache.org/licenses/LICENSE-2.0
+;;     https://www.apache.org/licenses/LICENSE-2.0
 ;;
 ;; Unless required by applicable law or agreed to in writing, software
 ;; distributed under the License is distributed on an "AS IS" BASIS, WITHOUT

data/ext/envpuppet

@@ -105,11 +105,11 @@ if [ "${ENVPUPPET_BLEEDING:-}" = "true" ]; then
   myrubylib="${myrubylib}:${ENVPUPPET_BASEDIR}/puppet-interfaces/lib"
 fi
 
-# http://github.com/jamtur01/puppet-scaffold.git
+# https://github.com/jamtur01/puppet-scaffold.git
 mypath="${mypath}:${ENVPUPPET_BASEDIR}/puppet-scaffold/bin"
 myrubylib="${myrubylib}:${ENVPUPPET_BASEDIR}/puppet-scaffold/lib"
 
-# http://github.com/puppetlabs/puppet-module-tool.git
+# https://github.com/puppetlabs/puppet-module-tool.git
 # Also known as "pmt"  Will become "puppet module"
 mypath="${mypath}:${ENVPUPPET_BASEDIR}/puppet-module-tool/bin"
 myrubylib="${myrubylib}:${ENVPUPPET_BASEDIR}/puppet-module-tool/lib"

data/ext/ips/puppetagent.xml

@@ -34,7 +34,7 @@
       </common_name>
       <documentation>
         <manpage title="puppet" section="1"/>
-        <doc_link name="puppetlabs.com" uri="http://puppetlabs.com/puppet/introduction"/>
+        <doc_link name="puppetlabs.com" uri="https://puppetlabs.com/puppet/introduction"/>
       </documentation>
     </template>
   </service>

data/ext/ips/puppetmaster.xml

@@ -34,7 +34,7 @@
       </common_name>
       <documentation>
         <manpage title="puppet" section="1"/>
-        <doc_link name="puppetlabs.com" uri="http://puppetlabs.com/puppet/introduction"/>
+        <doc_link name="puppetlabs.com" uri="https://puppetlabs.com/puppet/introduction"/>
       </documentation>
     </template>
   </service>