diff -Nru puppet-5.4.0/debian/changelog puppet-5.4.0/debian/changelog --- puppet-5.4.0/debian/changelog 2018-04-04 22:03:24.000000000 +0000 +++ puppet-5.4.0/debian/changelog 2018-04-19 21:06:40.000000000 +0000 @@ -1,3 +1,15 @@ +puppet (5.4.0-2ubuntu3) bionic; urgency=medium + + * Revert: + - Revert the Ubuntu delta. No changes left. + + DEP8 tests fail in the Ubuntu autopkgtest environment without + the delta. + * d/t/control: fix incorrect merge in 5.4.0-2ubuntu1: + - Wrong test was generating the certificate. + - Wrong tests were being run for puppet-master-passenger. + + -- Nishanth Aravamudan Thu, 19 Apr 2018 14:06:40 -0700 + puppet (5.4.0-2ubuntu2) bionic; urgency=medium * Revert the Ubuntu delta. No changes left. diff -Nru puppet-5.4.0/debian/control puppet-5.4.0/debian/control --- puppet-5.4.0/debian/control 2018-04-04 22:03:24.000000000 +0000 +++ puppet-5.4.0/debian/control 2018-04-19 21:06:31.000000000 +0000 @@ -1,7 +1,8 @@ Source: puppet Section: admin Priority: optional -Maintainer: Puppet Package Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Puppet Package Maintainers Uploaders: Micah Anderson , Andrew Pollock , Stig Sandbeck Mathisen , diff -Nru puppet-5.4.0/debian/patches/debian-changes puppet-5.4.0/debian/patches/debian-changes --- puppet-5.4.0/debian/patches/debian-changes 2018-04-04 22:03:24.000000000 +0000 +++ puppet-5.4.0/debian/patches/debian-changes 1970-01-01 00:00:00.000000000 +0000 @@ -1,998 +0,0 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - puppet (5.4.0-2ubuntu2) bionic; urgency=medium - . - * Revert the Ubuntu delta. No changes left. -Author: Matthias Klose - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: https://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: 2018-04-04 - ---- puppet-5.4.0.orig/man/man5/puppet.conf.5 -+++ puppet-5.4.0/man/man5/puppet.conf.5 -@@ -1,10 +1,10 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPETCONF" "5" "June 2017" "Puppet Labs, LLC" "Puppet manual" --\fBThis page is autogenerated; any changes will get overwritten\fR \fI(last generated on 2017\-06\-29 14:42:23 \-0700)\fR -+.TH "PUPPETCONF" "5" "March 2018" "Puppet Labs, LLC" "Puppet manual" -+\fBThis page is autogenerated; any changes will get overwritten\fR \fI(last generated on 2018\-03\-29 06:21:28 UTC)\fR - . --.SH "Configuration Settings" -+.SH "Configuration settings" - . - .IP "\(bu" 4 - Each of these settings can be specified in \fBpuppet\.conf\fR or on the command line\. -@@ -22,6 +22,9 @@ Multiple values should be specified as c - Settings that represent time intervals should be specified in duration format: an integer immediately followed by one of the units \'y\' (years of 365 days), \'d\' (days), \'h\' (hours), \'m\' (minutes), or \'s\' (seconds)\. The unit cannot be combined with other units, and defaults to seconds when omitted\. Examples are \'3600\' which is equivalent to \'1h\' (one hour), and \'1825d\' which is equivalent to \'5y\' (5 years)\. - . - .IP "\(bu" 4 -+If you use the \fBsplay\fR setting, note that the period that it waits changes each time the Puppet agent is restarted\. -+. -+.IP "\(bu" 4 - Settings that take a single file or directory can optionally set the owner, group, and mode for their value: \fBrundir = $vardir/run { owner = puppet, group = puppet, mode = 644 }\fR - . - .IP "\(bu" 4 -@@ -30,7 +33,7 @@ The Puppet executables will ignore any s - .IP "" 0 - . - .P --See the configuration guide \fIhttps://docs\.puppetlabs\.com/puppet/latest/reference/config_about_settings\.html\fR for more details\. -+See the configuration guide \fIhttps://puppet\.com/docs/puppet/latest/config_about_settings\.html\fR for more details\. - . - .SS "agent_catalog_run_lockfile" - A lock file to indicate that a puppet agent catalog run is currently in progress\. The file contains the pid of the process that holds the lock on the catalog run\. -@@ -113,7 +116,7 @@ The search path for \fBglobal\fR modules - These are the modules that will be used by \fIall\fR environments\. Note that the \fBmodules\fR directory of the active environment will have priority over any global directories\. For more info, see \fIhttps://docs\.puppet\.com/puppet/latest/reference/environments\.html\fR - . - .IP "\(bu" 4 --\fIDefault\fR: $codedir/modules:/opt/puppetlabs/puppet/modules -+\fIDefault\fR: $codedir/modules:/usr/share/puppet/modules - . - .IP "" 0 - . -@@ -268,10 +271,22 @@ The certificate directory\. - .IP "" 0 - . - .SS "certificate_revocation" --Whether certificate revocation should be supported by downloading a Certificate Revocation List (CRL) to all clients\. If enabled, CA chaining will almost definitely not work\. -+Whether certificate revocation checking should be enabled, and what level of checking should be performed\. -+. -+.P -+When certificate_revocation is set to \'true\' or \'chain\', Puppet will download the CA CRL and will perform revocation checking against each certificate in the chain\. -+. -+.P -+Puppet is unable to load multiple CRLs, so if certificate_revocation is set to \'chain\' and Puppet attempts to verify a certificate signed by a root CA the behavior is equivalent to the \'leaf\' setting, and if Puppet attempts to verify a certificate signed by an intermediate CA then verification will fail as Puppet will be unable to load the multiple CRLs required for full chain checking\. As such the \'chain\' setting is limited in functionality and is meant as a stand in pending the implementation of full chain checking\. -+. -+.P -+When certificate_revocation is set to \'leaf\', Puppet will download the CA CRL and will verify the leaf certificate against that CRL\. CRLs will not be fetched or checked for the rest of the certificates in the chain\. If you are using an intermediate CA certificate and want to enable certificate revocation checking, this setting must be set to \'leaf\'\. -+. -+.P -+When certificate_revocation is set to \'false\', Puppet will disable all certificate revocation checking and will not attempt to download the CRL\. - . - .IP "\(bu" 4 --\fIDefault\fR: true -+\fIDefault\fR: chain - . - .IP "" 0 - . -@@ -296,7 +311,7 @@ The special value \fBca\fR is reserved, - Defaults to the node\'s fully qualified domain name\. - . - .IP "\(bu" 4 --\fIDefault\fR: rll\.corp\.puppetlabs\.net -+\fIDefault\fR: (node\'s fully qualified domain name) - . - .IP "" 0 - . -@@ -496,13 +511,21 @@ Which arguments to pass to the diff comm - .IP "" 0 - . - .SS "digest_algorithm" --Which digest algorithm to use for file resources and the filebucket\. Valid values are md5, sha256\. Default is md5\. -+Which digest algorithm to use for file resources and the filebucket\. Valid values are md5, sha256, sha384, sha512, sha224\. Default is md5\. - . - .IP "\(bu" 4 - \fIDefault\fR: md5 - . - .IP "" 0 - . -+.SS "disable_i18n" -+If true, turns off all translations of Puppet and module log messages, which affects error, warning, and info log messages, as well as any translations in the report and CLI\. -+. -+.IP "\(bu" 4 -+\fIDefault\fR: false -+. -+.IP "" 0 -+. - .SS "disable_per_environment_manifest" - Whether to disallow an environment\-specific main manifest\. When set to \fBtrue\fR, Puppet will use the manifest specified in the \fBdefault_manifest\fR setting for all environments\. If an environment specifies a different main manifest in its \fBenvironment\.conf\fR file, catalog requests for that environment will fail with an error\. - . -@@ -581,7 +604,16 @@ Whether to document all resources when u - .IP "" 0 - . - .SS "environment" --The environment Puppet is running in\. For clients (e\.g\., \fBpuppet agent\fR) this determines the environment itself, which is used to find modules and much more\. For servers (i\.e\., \fBpuppet master\fR) this provides the default environment for nodes we know nothing about\. -+The environment in which Puppet is running\. For clients, such as \fBpuppet agent\fR, this determines the environment itself, which Puppet uses to find modules and much more\. For servers, such as \fBpuppet master\fR, this provides the default environment for nodes that Puppet knows nothing about\. -+. -+.P -+When defining an environment in the \fB[agent]\fR section, this refers to the environment that the agent requests from the master\. The environment doesn\'t have to exist on the local filesystem because the agent fetches it from the master\. This definition is used when running \fBpuppet agent\fR\. -+. -+.P -+When defined in the \fB[user]\fR section, the environment refers to the path that Puppet uses to search for code and modules related to its execution\. This requires the environment to exist locally on the filesystem where puppet is being executed\. Puppet subcommands, including \fBpuppet module\fR and \fBpuppet apply\fR, use this definition\. -+. -+.P -+Given that the context and effects vary depending on the config section \fIhttps://puppet\.com/docs/puppet/latest/config_file_main\.html#config\-sections\fR in which the \fBenvironment\fR setting is defined, do not set it globally\. - . - .IP "\(bu" 4 - \fIDefault\fR: production -@@ -728,6 +760,14 @@ Freezes the \'main\' class, disallowing - . - .IP "" 0 - . -+.SS "future_features" -+Whether or not to enable all features currently being developed for future major releases of Puppet\. Should be used with caution, as in development features are experimental and can have unexpected effects\. -+. -+.IP "\(bu" 4 -+\fIDefault\fR: false -+. -+.IP "" 0 -+. - .SS "genconfig" - When true, causes Puppet applications to print an example config file to stdout and exit\. The example will include descriptions of each setting, and the current (or default) value of each setting, incorporating any settings overridden on the CLI (with the exception of \fBgenconfig\fR itself)\. This setting only makes sense when specified on the command line as \fB\-\-genconfig\fR\. - . -@@ -895,7 +935,7 @@ The time to wait for one block to be rea - The HTTP User\-Agent string to send when making network requests\. - . - .IP "\(bu" 4 --\fIDefault\fR: Puppet/5\.0\.0 Ruby/2\.4\.1\-p111 (x86_64\-darwin15) -+\fIDefault\fR: Puppet/5\.4\.0 Ruby/2\.5\.0\-p0 (x86_64\-linux\-gnu) - . - .IP "" 0 - . -@@ -1044,6 +1084,22 @@ Where each client stores the CA certific - . - .IP "" 0 - . -+.SS "localedest" -+Where Puppet should store translation files that it pulls down from the central server\. -+. -+.IP "\(bu" 4 -+\fIDefault\fR: $vardir/locales -+. -+.IP "" 0 -+. -+.SS "localesource" -+From where to retrieve translation files\. The standard Puppet \fBfile\fR type is used for retrieval, so anything that is a valid file source can be used here\. -+. -+.IP "\(bu" 4 -+\fIDefault\fR: puppet:///locales -+. -+.IP "" 0 -+. - .SS "log_level" - Default logging level for messages from Puppet\. Allowed values are: - . -@@ -1566,6 +1622,14 @@ How often puppet agent applies the catal - . - .IP "" 0 - . -+.SS "runtimeout" -+The maximum amount of time an agent run is allowed to take\. A Puppet agent run that exceeds this timeout will be aborted\. Defaults to 0, which is unlimited\. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y)\. -+. -+.IP "\(bu" 4 -+\fIDefault\fR: 0 -+. -+.IP "" 0 -+. - .SS "serial" - Where the serial number for certificates is stored\. - . -@@ -1617,11 +1681,24 @@ Where the CA stores signed certificates\ - .SS "skip_tags" - Tags to use to filter resources\. If this is set, then only resources not tagged with the specified tags will be applied\. Values must be comma\-separated\. - . -+.SS "sourceaddress" -+The address the agent should use to initiate requests\. -+. -+.TP -+\fIDefault\fR: -+ -+. - .SS "splay" --Whether to sleep for a pseudo\-random (but consistent) amount of time before a run\. -+Whether to sleep for a random amount of time, ranging from immediately up to its \fB$splaylimit\fR, before performing its first agent run after a service restart\. After this period, the agent runs periodically on its \fB$runinterval\fR\. -+. -+.P -+For example, assume a default 30\-minute \fB$runinterval\fR, \fBsplay\fR set to its default of \fBfalse\fR, and an agent starting at :00 past the hour\. The agent would check in every 30 minutes at :01 and :31 past the hour\. - . - .P --For example, without \fBsplay\fR enabled, your agent checks in every 30 minutes at :01 and :31 past the hour\. After enabling \fBsplay\fR, the agent will wait the pseudorandom sleep time, say eight minutes, and then check in every 30 minutes, at :09 and :39 after the hour\. If you restart the same agent at 12:45 PM, it will wait its eight minutes, and check in at 12:52 PM, and every 30 minutes after that, at 1:22 PM, 1:52 PM, and so on\. Other agents will have different sleep times, and so will check in at different times even if they are all restarted at the same time\. -+With \fBsplay\fR enabled, it waits any amount of time up to its \fB$splaylimit\fR before its first run\. For example, it might randomly wait 8 minutes, then start its first run at :08 past the hour\. With the \fB$runinterval\fR at its default 30 minutes, its next run will be at :38 past the hour\. -+. -+.P -+If you restart an agent\'s puppet service with \fBsplay\fR enabled, it recalculates its splay period and delays its first agent run after restarting for this new period\. If you simultaneously restart a group of puppet agents with \fBsplay\fR enabled, their checkins to your puppet masters can be distributed more evenly\. - . - .IP "\(bu" 4 - \fIDefault\fR: false -@@ -1629,7 +1706,7 @@ For example, without \fBsplay\fR enabled - .IP "" 0 - . - .SS "splaylimit" --The maximum time to delay before runs\. Defaults to being the same as the run interval\. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y)\. -+The maximum time to delay before an agent\'s first run when \fBsplay\fR is enabled\. Defaults to the agent\'s \fB$runinterval\fR\. The \fBsplay\fR interval is random and recalculated each time the agent is started or restarted\. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y)\. - . - .IP "\(bu" 4 - \fIDefault\fR: $runinterval -@@ -1640,7 +1717,7 @@ The maximum time to delay before runs\. - The domain which will be queried to find the SRV records of servers to use\. - . - .IP "\(bu" 4 --\fIDefault\fR: corp\.puppetlabs\.net -+\fIDefault\fR: wildorchidsubic\.com - . - .IP "" 0 - . -@@ -1705,7 +1782,7 @@ Where puppet agent and puppet master sto - .IP "" 0 - . - .SS "static_catalogs" --Whether to compile a static catalog\. -+Whether to compile a static catalog \fIhttps://docs\.puppet\.com/puppet/latest/static_catalogs\.html#enabling\-or\-disabling\-static\-catalogs\fR, which occurs only on a Puppet Server master when the \fBcode\-id\-command\fR and \fBcode\-content\-command\fR settings are configured in its \fBpuppetserver\.conf\fR file\. - . - .IP "\(bu" 4 - \fIDefault\fR: true -@@ -1792,10 +1869,10 @@ Whether to print a transaction summary\. - .IP "" 0 - . - .SS "supported_checksum_types" --Checksum types supported by this agent for use in file resources of a static catalog\. Values must be comma\-separated\. Valid types are md5, md5lite, sha256, sha256lite, sha1, sha1lite, mtime, ctime\. -+Checksum types supported by this agent for use in file resources of a static catalog\. Values must be comma\-separated\. Valid types are md5, md5lite, sha256, sha256lite, sha384, sha512, sha224, sha1, sha1lite, mtime, ctime\. Default is md5, sha256, sha384, sha512, sha224\. - . - .IP "\(bu" 4 --\fIDefault\fR: ["md5", "sha256"] -+\fIDefault\fR: ["md5", "sha256", "sha384", "sha512", "sha224"] - . - .IP "" 0 - . -@@ -1810,6 +1887,14 @@ What syslog facility to use when logging - .SS "tags" - Tags to use to find resources\. If this is set, then only resources tagged with the specified tags will be applied\. Values must be comma\-separated\. - . -+.SS "tasks" -+Turns on experimental support for tasks and plans in the puppet language\. This is for internal API use only\. Do not change this setting\. -+. -+.IP "\(bu" 4 -+\fIDefault\fR: false -+. -+.IP "" 0 -+. - .SS "trace" - Whether to print stack traces on some errors - . -@@ -1905,4 +1990,4 @@ The directory in which YAML data is stor - .IP "" 0 - . - .P --\fIThis page autogenerated on 2017\-06\-29 14:42:23 \-0700\fR -+\fIThis page autogenerated on 2018\-03\-29 06:21:28 UTC\fR ---- puppet-5.4.0.orig/man/man8/puppet-agent.8 -+++ puppet-5.4.0/man/man8/puppet-agent.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-AGENT" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-AGENT" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-agent\fR \- The puppet agent daemon -@@ -13,7 +13,7 @@ Retrieves the client configuration from - This service may be run as a daemon, run periodically using cron (or something similar), or run interactively for testing purposes\. - . - .SH "USAGE" --puppet agent [\-\-certname \fINAME\fR] [\-D|\-\-daemonize|\-\-no\-daemonize] [\-d|\-\-debug] [\-\-detailed\-exitcodes] [\-\-digest \fIDIGEST\fR] [\-\-disable [MESSAGE]] [\-\-enable] [\-\-fingerprint] [\-h|\-\-help] [\-l|\-\-logdest syslog|eventlog|\fIFILE\fR|console] [\-\-masterport \fIPORT\fR] [\-\-noop] [\-o|\-\-onetime] [\-t|\-\-test] [\-v|\-\-verbose] [\-V|\-\-version] [\-w|\-\-waitforcert \fISECONDS\fR] -+puppet agent [\-\-certname \fINAME\fR] [\-D|\-\-daemonize|\-\-no\-daemonize] [\-d|\-\-debug] [\-\-detailed\-exitcodes] [\-\-digest \fIDIGEST\fR] [\-\-disable [MESSAGE]] [\-\-enable] [\-\-fingerprint] [\-h|\-\-help] [\-l|\-\-logdest syslog|eventlog|\fIABS FILEPATH\fR|console] [\-\-masterport \fIPORT\fR] [\-\-noop] [\-o|\-\-onetime] [\-\-sourceaddress \fIIP_ADDRESS\fR] [\-t|\-\-test] [\-v|\-\-verbose] [\-V|\-\-version] [\-w|\-\-waitforcert \fISECONDS\fR] - . - .SH "DESCRIPTION" - This is the main puppet client\. Its job is to retrieve the local machine\'s configuration from a remote server and apply it\. In order to successfully communicate with the remote server, the client must have a certificate signed by a certificate authority that the server trusts; the recommended method for this, at the moment, is to run a certificate authority as part of the puppet server (which is the default)\. The client will connect and request a signed certificate, and will continue connecting until it receives one\. -@@ -133,6 +133,10 @@ Use \'noop\' mode where the daemon runs - Run the configuration once\. Runs a single (normally daemonized) Puppet run\. Useful for interactively running puppet agent when used in conjunction with the \-\-no\-daemonize option\. (This is a Puppet setting, and can go in puppet\.conf\. Note the special \'no\-\' prefix for boolean settings on the command line\.) - . - .TP -+\-\-sourceaddress -+Set the source IP address for transactions\. This defaults to automatically selected\. (This is a Puppet setting, and can go in puppet\.conf\.) -+. -+.TP - \-\-test - Enable the most common options used for testing\. These are \'onetime\', \'verbose\', \'no\-daemonize\', \'no\-usecacheonfailure\', \'detailed\-exitcodes\', \'no\-splay\', and \'show_diff\'\. - . ---- puppet-5.4.0.orig/man/man8/puppet-apply.8 -+++ puppet-5.4.0/man/man8/puppet-apply.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-APPLY" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-APPLY" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-apply\fR \- Apply Puppet manifests locally -@@ -10,7 +10,7 @@ - Applies a standalone Puppet manifest to the local system\. - . - .SH "USAGE" --puppet apply [\-h|\-\-help] [\-V|\-\-version] [\-d|\-\-debug] [\-v|\-\-verbose] [\-e|\-\-execute] [\-\-detailed\-exitcodes] [\-L|\-\-loadclasses] [\-l|\-\-logdest syslog|eventlog|\fIFILE\fR|console] [\-\-noop] [\-\-catalog \fIcatalog\fR] [\-\-write\-catalog\-summary] \fIfile\fR -+puppet apply [\-h|\-\-help] [\-V|\-\-version] [\-d|\-\-debug] [\-v|\-\-verbose] [\-e|\-\-execute] [\-\-detailed\-exitcodes] [\-L|\-\-loadclasses] [\-l|\-\-logdest syslog|eventlog|\fIABS FILEPATH\fR|console] [\-\-noop] [\-\-catalog \fIcatalog\fR] [\-\-write\-catalog\-summary] \fIfile\fR - . - .SH "DESCRIPTION" - This is the standalone puppet execution tool; use it to apply individual manifests\. ---- puppet-5.4.0.orig/man/man8/puppet-ca.8 -+++ puppet-5.4.0/man/man8/puppet-ca.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-CA" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-CA" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-ca\fR \- Local Puppet Certificate Authority management\. ---- puppet-5.4.0.orig/man/man8/puppet-catalog.8 -+++ puppet-5.4.0/man/man8/puppet-catalog.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-CATALOG" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-CATALOG" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-catalog\fR \- Compile, save, view, and convert catalogs\. ---- puppet-5.4.0.orig/man/man8/puppet-cert.8 -+++ puppet-5.4.0/man/man8/puppet-cert.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-CERT" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-CERT" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-cert\fR \- Manage certificates and requests ---- puppet-5.4.0.orig/man/man8/puppet-certificate.8 -+++ puppet-5.4.0/man/man8/puppet-certificate.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-CERTIFICATE" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-CERTIFICATE" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-certificate\fR \- Provide access to the CA for certificate management\. ---- puppet-5.4.0.orig/man/man8/puppet-certificate_request.8 -+++ puppet-5.4.0/man/man8/puppet-certificate_request.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-CERTIFICATE_REQUEST" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-CERTIFICATE_REQUEST" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-certificate_request\fR \- Manage certificate requests\. ---- puppet-5.4.0.orig/man/man8/puppet-certificate_revocation_list.8 -+++ puppet-5.4.0/man/man8/puppet-certificate_revocation_list.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-CERTIFICATE_REVOCATION_LIST" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-CERTIFICATE_REVOCATION_LIST" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-certificate_revocation_list\fR \- Manage the list of revoked certificates\. ---- puppet-5.4.0.orig/man/man8/puppet-config.8 -+++ puppet-5.4.0/man/man8/puppet-config.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-CONFIG" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-CONFIG" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-config\fR \- Interact with Puppet\'s settings\. -@@ -43,6 +43,25 @@ Less commonly used is the \'user\' secti - .SH "ACTIONS" - . - .TP -+\fBdelete\fR \- Delete a Puppet setting\. -+\fBSYNOPSIS\fR -+. -+.IP -+puppet config delete [\-\-section SECTION_NAME] (\fIsetting\fR -+. -+.IP -+\fBDESCRIPTION\fR -+. -+.IP -+Deletes a setting from the specified section\. (The default is the section \'main\')\. -+. -+.IP -+\fBNOTES\fR -+. -+.IP -+By default, this action deletes the configuration setting from the \'main\' configuration domain\. Use the \'\-\-section\' flags to delete settings from other configuration domains\. -+. -+.TP - \fBprint\fR \- Examine Puppet\'s current settings\. - \fBSYNOPSIS\fR - . -@@ -84,6 +103,21 @@ Updates values in the \fBpuppet\.conf\fR - By default, this action manipulates the configuration in the \'main\' section\. Use the \'\-\-section\' flag to manipulate other configuration domains\. - . - .SH "EXAMPLES" -+\fBdelete\fR -+. -+.P -+Delete the setting \'setting_name\' from the \'main\' configuration domain: -+. -+.P -+$ puppet config delete setting_name -+. -+.P -+Delete the setting \'setting_name\' from the \'master\' configuration domain: -+. -+.P -+$ puppet config delete setting_name \-\-section master -+. -+.P - \fBprint\fR - . - .P ---- puppet-5.4.0.orig/man/man8/puppet-describe.8 -+++ puppet-5.4.0/man/man8/puppet-describe.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-DESCRIBE" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-DESCRIBE" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-describe\fR \- Display help about resource types ---- puppet-5.4.0.orig/man/man8/puppet-device.8 -+++ puppet-5.4.0/man/man8/puppet-device.8 -@@ -1,37 +1,43 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-DEVICE" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-DEVICE" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-device\fR \- Manage remote network devices - . - .SH "SYNOPSIS" --Retrieves all configurations from the puppet master and apply them to the remote devices configured in /etc/puppetlabs/puppet/device\.conf\. -+Retrieves catalogs from the Puppet master and applies them to remote devices\. - . - .P --Currently must be run out periodically, using cron or something similar\. -+This subcommand can be run manually; or periodically using cron, a scheduled task, or a similar tool\. - . - .SH "USAGE" --puppet device [\-d|\-\-debug] [\-\-detailed\-exitcodes] [\-\-deviceconfig \fIfile\fR] [\-h|\-\-help] [\-l|\-\-logdest syslog|\fIfile\fR|console] [\-v|\-\-verbose] [\-w|\-\-waitforcert \fIseconds\fR] [\-t|\-\-target \fIdevice\fR] [\-V|\-\-version] -+puppet device [\-d|\-\-debug] [\-\-detailed\-exitcodes] [\-\-deviceconfig \fIfile\fR] [\-h|\-\-help] [\-l|\-\-logdest syslog|\fIfile\fR|console] [\-v|\-\-verbose] [\-w|\-\-waitforcert \fIseconds\fR] [\-t|\-\-target \fIdevice\fR] [\-\-user=\fIuser\fR] [\-V|\-\-version] - . - .SH "DESCRIPTION" --Once the client has a signed certificate for a given remote device, it will retrieve its configuration and apply it\. -+Devices require a proxy Puppet agent to request certificates, collect facts, retrieve and apply catalogs, and store reports\. - . - .SH "USAGE NOTES" --One need a /etc/puppetlabs/puppet/device\.conf file with the following content: -+Devices managed by the puppet\-device subcommand on a Puppet agent are configured in device\.conf, which is located at $confdir/device\.conf by default, and is configurable with the $deviceconfig setting\. - . - .P --[remote\.device\.fqdn] type \fItype\fR url \fIurl\fR -+The device\.conf file is an INI\-like file, with one section per device: - . - .P --where: * type: the current device type (the only value at this time is cisco) * url: an url allowing to connect to the device -+[\fIDEVICE_CERTNAME\fR] type \fITYPE\fR url \fIURL\fR debug - . - .P --Supported url must conforms to: scheme://user:password@hostname/?query -+The section name specifies the certname of the device\. - . - .P --with: * scheme: either ssh or telnet * user: username, can be omitted depending on the switch/router configuration * password: the connection password * query: this is device specific\. Cisco devices supports an enable parameter whose value would be the enable password\. -+The values for the type and url properties are specific to each type of device\. -+. -+.P -+The optional debug property specifies transport\-level debugging, and is limited to telnet and ssh transports\. -+. -+.P -+See https://docs\.puppet\.com/puppet/latest/config_file_device\.html for details\. - . - .SH "OPTIONS" - 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 \fIservername\fR\' as an argument\. -@@ -64,6 +70,10 @@ A path ending with \'\.json\' will recei - Target a specific device/certificate in the device\.conf\. Doing so will perform a device run against only that device/certificate\. - . - .TP -+\-\-user -+The user to run as\. -+. -+.TP - \-\-verbose - Turn on verbose reporting\. - . ---- puppet-5.4.0.orig/man/man8/puppet-doc.8 -+++ puppet-5.4.0/man/man8/puppet-doc.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-DOC" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-DOC" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-doc\fR \- Generate Puppet references ---- puppet-5.4.0.orig/man/man8/puppet-epp.8 -+++ puppet-5.4.0/man/man8/puppet-epp.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-EPP" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-EPP" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-epp\fR \- Interact directly with the EPP template parser/renderer\. ---- puppet-5.4.0.orig/man/man8/puppet-facts.8 -+++ puppet-5.4.0/man/man8/puppet-facts.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-FACTS" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-FACTS" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-facts\fR \- Retrieve and store facts\. ---- puppet-5.4.0.orig/man/man8/puppet-filebucket.8 -+++ puppet-5.4.0/man/man8/puppet-filebucket.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-FILEBUCKET" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-FILEBUCKET" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-filebucket\fR \- Store and retrieve files in a filebucket -@@ -34,13 +34,17 @@ list: List all files in the current loca - This is a stand\-alone filebucket client for sending files to a local or central filebucket\. - . - .P --Note that \'filebucket\' defaults to using a network\-based filebucket available on the server named \'puppet\'\. To use this, you\'ll have to be running as a user with valid Puppet certificates\. Alternatively, you can use your local file bucket by specifying \'\-\-local\'\. -+Note that \'filebucket\' defaults to using a network\-based filebucket available on the server named \'puppet\'\. To use this, you\'ll have to be running as a user with valid Puppet certificates\. Alternatively, you can use your local file bucket by specifying \'\-\-local\', or by specifying \'\-\-bucket\' with a local path\. - . - .SH "OPTIONS" - Note that any setting that\'s valid in the configuration file is also a valid long argument\. For example, \'ssldir\' is a valid setting, so you can specify \'\-\-ssldir \fIdirectory\fR\' as an argument\. - . - .P --See the configuration file documentation at https://docs\.puppetlabs\.com/puppet/latest/reference/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \'\-\-genconfig\'\. -+See the configuration file documentation at https://puppet\.com/docs/puppet/latest/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \'\-\-genconfig\'\. -+. -+.TP -+\-\-bucket -+Specify a local filebucket path\. This overrides the default path set in \'$clientbucketdir\'\. - . - .TP - \-\-debug -@@ -48,19 +52,19 @@ Enable full debugging\. - . - .TP - \-\-fromdate --(list only) Select bucket files from \'fromdate\' -+(list only) Select bucket files from \'fromdate\'\. - . - .TP - \-\-help --Print this help message -+Print this help message\. - . - .TP - \-\-local --Use the local filebucket\. This will use the default configuration information\. -+Use the local filebucket\. This uses the default configuration information and the bucket located at the \'$clientbucketdir\' setting by default\. If \'\-\-bucket\' is set, puppet uses that path instead\. - . - .TP - \-\-remote --Use a remote filebucket\. This will use the default configuration information\. -+Use a remote filebucket\. This uses the default configuration information and the bucket located at the \'$bucketdir\' setting by default\. - . - .TP - \-\-server -@@ -68,7 +72,7 @@ The server to send the file to, instead - . - .TP - \-\-todate --(list only) Select bucket files until \'todate\' -+(list only) Select bucket files until \'todate\'\. - . - .TP - \-\-verbose -@@ -78,38 +82,61 @@ Print extra information\. - \-\-version - Print version information\. - . --.SH "EXAMPLE" -+.SH "EXAMPLES" - . - .nf - -+## Backup a file to the filebucket, then restore it to a temporary directory - $ puppet filebucket backup /etc/passwd - /etc/passwd: 429b225650b912a2ee067b0a4cf1e949 - $ puppet filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949 -+ - ## Diff between two files in the filebucket - $ puppet filebucket \-l diff d43a6ecaa892a1962398ac9170ea9bf2 7ae322f5791217e031dc60188f4521ef - 1a2 - > again --## Diff between the file in the filebucket and the current one -+ -+## Diff between the file in the filebucket and a local file - $ puppet filebucket \-l diff d43a6ecaa892a1962398ac9170ea9bf2 /tmp/testFile - 1a2 - > again -+ -+## Backup a file to the filebucket and observe that it keeps each backup separate - $ puppet filebucket \-l list - d43a6ecaa892a1962398ac9170ea9bf2 2015\-05\-11 09:27:56 /tmp/TestFile -+ - $ echo again >> /tmp/TestFile -+ - $ puppet filebucket \-l backup /tmp/TestFile - /tmp/TestFile: 7ae322f5791217e031dc60188f4521ef --$ puppet filebucket \-l list -+ -+$ puppet filebucket \-l list - d43a6ecaa892a1962398ac9170ea9bf2 2015\-05\-11 09:27:56 /tmp/TestFile - 7ae322f5791217e031dc60188f4521ef 2015\-05\-11 09:52:15 /tmp/TestFile -+ -+## List files in a filebucket within date ranges - $ puppet filebucket \-l \-f 2015\-01\-01 \-t 2015\-01\-11 list - -+ - $ puppet filebucket \-l \-f 2015\-05\-10 list - d43a6ecaa892a1962398ac9170ea9bf2 2015\-05\-11 09:27:56 /tmp/TestFile - 7ae322f5791217e031dc60188f4521ef 2015\-05\-11 09:52:15 /tmp/TestFile -+ - $ puppet filebucket \-l \-f "2015\-05\-11 09:30:00" list - 7ae322f5791217e031dc60188f4521ef 2015\-05\-11 09:52:15 /tmp/TestFile -+ - $ puppet filebucket \-l \-t "2015\-05\-11 09:30:00" list - d43a6ecaa892a1962398ac9170ea9bf2 2015\-05\-11 09:27:56 /tmp/TestFile -+## Manage files in a specific local filebucket -+$ puppet filebucket \-b /tmp/TestBucket backup /tmp/TestFile2 -+/tmp/TestFile2: d41d8cd98f00b204e9800998ecf8427e -+$ puppet filebucket \-b /tmp/TestBucket list -+d41d8cd98f00b204e9800998ecf8427e 2015\-05\-11 09:33:22 /tmp/TestFile2 -+ -+## From a Puppet master, list files in the master bucketdir -+$ puppet filebucket \-b $(puppet config print bucketdir \-\-section master) list -+d43a6ecaa892a1962398ac9170ea9bf2 2015\-05\-11 09:27:56 /tmp/TestFile -+7ae322f5791217e031dc60188f4521ef 2015\-05\-11 09:52:15 /tmp/TestFile - . - .fi - . ---- puppet-5.4.0.orig/man/man8/puppet-generate.8 -+++ puppet-5.4.0/man/man8/puppet-generate.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-GENERATE" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-GENERATE" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-generate\fR \- Generates Puppet code from Ruby definitions\. ---- puppet-5.4.0.orig/man/man8/puppet-help.8 -+++ puppet-5.4.0/man/man8/puppet-help.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-HELP" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-HELP" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-help\fR \- Display Puppet help\. ---- puppet-5.4.0.orig/man/man8/puppet-key.8 -+++ puppet-5.4.0/man/man8/puppet-key.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-KEY" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-KEY" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-key\fR \- Create, save, and remove certificate keys\. ---- puppet-5.4.0.orig/man/man8/puppet-lookup.8 -+++ puppet-5.4.0/man/man8/puppet-lookup.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-LOOKUP" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-LOOKUP" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-lookup\fR \- Interactive Hiera lookup ---- puppet-5.4.0.orig/man/man8/puppet-man.8 -+++ puppet-5.4.0/man/man8/puppet-man.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-MAN" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-MAN" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-man\fR \- Display Puppet manual pages\. ---- puppet-5.4.0.orig/man/man8/puppet-master.8 -+++ puppet-5.4.0/man/man8/puppet-master.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-MASTER" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-MASTER" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-master\fR \- The puppet master daemon ---- puppet-5.4.0.orig/man/man8/puppet-module.8 -+++ puppet-5.4.0/man/man8/puppet-module.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-MODULE" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-MODULE" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-module\fR \- Creates, installs and searches for modules on the Puppet Forge\. -@@ -32,7 +32,16 @@ Whether to log debug information\. - . - .TP - \-\-environment production --The environment Puppet is running in\. For clients (e\.g\., \fBpuppet agent\fR) this determines the environment itself, which is used to find modules and much more\. For servers (i\.e\., \fBpuppet master\fR) this provides the default environment for nodes we know nothing about\. -+The environment in which Puppet is running\. For clients, such as \fBpuppet agent\fR, this determines the environment itself, which Puppet uses to find modules and much more\. For servers, such as \fBpuppet master\fR, this provides the default environment for nodes that Puppet knows nothing about\. -+. -+.IP -+When defining an environment in the \fB[agent]\fR section, this refers to the environment that the agent requests from the master\. The environment doesn\'t have to exist on the local filesystem because the agent fetches it from the master\. This definition is used when running \fBpuppet agent\fR\. -+. -+.IP -+When defined in the \fB[user]\fR section, the environment refers to the path that Puppet uses to search for code and modules related to its execution\. This requires the environment to exist locally on the filesystem where puppet is being executed\. Puppet subcommands, including \fBpuppet module\fR and \fBpuppet apply\fR, use this definition\. -+. -+.IP -+Given that the context and effects vary depending on the config section \fIhttps://puppet\.com/docs/puppet/latest/config_file_main\.html#config\-sections\fR in which the \fBenvironment\fR setting is defined, do not set it globally\. - . - .TP - \-\-modulepath -@@ -54,7 +63,7 @@ puppet module build [\fIpath\fR] - \fBDESCRIPTION\fR - . - .IP --Prepares a local module for release on the Puppet Forge by building a ready\-to\-upload archive file\. -+Prepares a local module for release on the Puppet Forge by building a ready\-to\-upload archive file\. Note: Module build uses MD5 checksums, which are prohibited on FIPS enabled systems\. - . - .IP - This action uses the metadata\.json file in the module directory to set metadata used by the Forge\. See \fIhttps://docs\.puppetlabs\.com/puppet/latest/reference/modules_publishing\.html\fR for more about writing metadata\.json files\. -@@ -123,7 +132,7 @@ puppet module install [\-\-force | \-f] - \fBDESCRIPTION\fR - . - .IP --Installs a module from the Puppet Forge or from a release archive file\. -+Installs a module from the Puppet Forge or from a release archive file\. Note: Module install uses MD5 checksums, which are prohibited on FIPS enabled systems\. - . - .IP - The specified module will be installed into the directory specified with the \fB\-\-target\-dir\fR option, which defaults to the first directory in the modulepath\. -@@ -210,7 +219,7 @@ puppet module uninstall [\-\-force | \-f - \fBDESCRIPTION\fR - . - .IP --Uninstalls a puppet module from the modulepath (or a specific target directory)\. -+Uninstalls a puppet module from the modulepath (or a specific target directory)\. Note: Module uninstall uses MD5 checksums, which are prohibited on FIPS enabled systems\. - . - .IP - \fBOPTIONS\fR \fI\-\-force\fR | \fI\-f\fR \- Force the uninstall of an installed module even if there are local changes or the possibility of causing broken dependencies\. -@@ -241,7 +250,7 @@ puppet module upgrade [\-\-force | \-f] - \fBDESCRIPTION\fR - . - .IP --Upgrades a puppet module\. -+Upgrades a puppet module\. Note: Module upgrade uses MD5 checksums, which are prohibited on FIPS enabled systems\. - . - .IP - \fBOPTIONS\fR \fI\-\-force\fR | \fI\-f\fR \- Force the upgrade of an installed module even if there are local changes or the possibility of causing broken dependencies\. Implies \-\-ignore\-dependencies\. ---- puppet-5.4.0.orig/man/man8/puppet-node.8 -+++ puppet-5.4.0/man/man8/puppet-node.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-NODE" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-NODE" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-node\fR \- View and manage node definitions\. ---- puppet-5.4.0.orig/man/man8/puppet-parser.8 -+++ puppet-5.4.0/man/man8/puppet-parser.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-PARSER" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-PARSER" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-parser\fR \- Interact directly with the parser\. ---- puppet-5.4.0.orig/man/man8/puppet-plugin.8 -+++ puppet-5.4.0/man/man8/puppet-plugin.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-PLUGIN" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-PLUGIN" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-plugin\fR \- Interact with the Puppet plugin system\. ---- puppet-5.4.0.orig/man/man8/puppet-report.8 -+++ puppet-5.4.0/man/man8/puppet-report.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-REPORT" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-REPORT" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-report\fR \- Create, display, and submit reports\. ---- puppet-5.4.0.orig/man/man8/puppet-resource.8 -+++ puppet-5.4.0/man/man8/puppet-resource.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-RESOURCE" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-RESOURCE" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-resource\fR \- The resource abstraction layer shell ---- /dev/null -+++ puppet-5.4.0/man/man8/puppet-script.8 -@@ -0,0 +1,67 @@ -+.\" generated with Ronn/v0.7.3 -+.\" http://github.com/rtomayko/ronn/tree/0.7.3 -+. -+.TH "PUPPET\-SCRIPT" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" -+. -+.SH "NAME" -+\fBpuppet\-script\fR \- Run a puppet manifests as a script without compiling a catalog -+. -+.SH "SYNOPSIS" -+Runs a puppet language script without compiling a catalog\. -+. -+.SH "USAGE" -+puppet script [\-h|\-\-help] [\-V|\-\-version] [\-d|\-\-debug] [\-v|\-\-verbose] [\-e|\-\-execute] [\-l|\-\-logdest syslog|eventlog|\fIFILE\fR|console] [\-\-noop] \fIfile\fR -+. -+.SH "DESCRIPTION" -+This is a standalone puppet script runner tool; use it to run puppet code without compiling a catalog\. -+. -+.P -+When provided with a modulepath, via command line or config file, puppet script can load functions, types, tasks and plans from modules\. -+. -+.SH "OPTIONS" -+Note that any setting that\'s valid in the configuration file is also a valid long argument\. For example, \'environment\' is a valid setting, so you can specify \'\-\-environment mytest\' as an argument\. -+. -+.P -+See the configuration file documentation at https://docs\.puppetlabs\.com/puppet/latest/reference/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \'\-\-genconfig\'\. -+. -+.TP -+\-\-debug -+Enable full debugging\. -+. -+.TP -+\-\-help -+Print this help message -+. -+.TP -+\-\-logdest -+Where to send log messages\. Choose between \'syslog\' (the POSIX syslog service), \'eventlog\' (the Windows Event Log), \'console\', or the path to a log file\. Defaults to \'console\'\. -+. -+.IP -+A path ending with \'\.json\' will receive structured output in JSON format\. The log file will not have an ending \']\' automatically written to it due to the appending nature of logging\. It must be appended manually to make the content valid JSON\. -+. -+.TP -+\-\-noop -+Use \'noop\' mode where Puppet runs in a no\-op or dry\-run mode\. This is useful for seeing what changes Puppet will make without actually executing the changes\. Applies to tasks only\. -+. -+.TP -+\-\-execute -+Execute a specific piece of Puppet code -+. -+.TP -+\-\-verbose -+Print extra information\. -+. -+.SH "EXAMPLE" -+. -+.nf -+ -+$ puppet script \-l /tmp/manifest\.log manifest\.pp -+$ puppet script \-\-modulepath=/root/dev/modules \-e \'notice("hello world")\' -+. -+.fi -+. -+.SH "AUTHOR" -+Henrik Lindberg -+. -+.SH "COPYRIGHT" -+Copyright (c) 2017 Puppet Inc\., LLC Licensed under the Apache 2\.0 License ---- puppet-5.4.0.orig/man/man8/puppet-status.8 -+++ puppet-5.4.0/man/man8/puppet-status.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET\-STATUS" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET\-STATUS" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\-status\fR \- View puppet server status\. ---- puppet-5.4.0.orig/man/man8/puppet.8 -+++ puppet-5.4.0/man/man8/puppet.8 -@@ -1,7 +1,7 @@ - .\" generated with Ronn/v0.7.3 - .\" http://github.com/rtomayko/ronn/tree/0.7.3 - . --.TH "PUPPET" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual" -+.TH "PUPPET" "8" "March 2018" "Puppet Labs, LLC" "Puppet manual" - . - .SH "NAME" - \fBpuppet\fR -@@ -13,7 +13,7 @@ Usage: puppet \fIsubcommand\fR [options] - Available subcommands: - . - .P --agent The puppet agent daemon apply Apply Puppet manifests locally ca Local Puppet Certificate Authority management\. (Deprecated) catalog Compile, save, view, and convert catalogs\. cert Manage certificates and requests certificate Provide access to the CA for certificate management\. certificate_request Manage certificate requests\. (Deprecated) certificate_revocation_list Manage the list of revoked certificates\. (Deprecated) config Interact with Puppet\'s settings\. describe Display help about resource types device Manage remote network devices doc Generate Puppet references epp Interact directly with the EPP template parser/renderer\. facts Retrieve and store facts\. filebucket Store and retrieve files in a filebucket generate Generates Puppet code from Ruby definitions\. help Display Puppet help\. key Create, save, and remove certificate keys\. (Deprecated) lookup Interactive Hiera lookup man Display Puppet manual pages\. master The puppet master daemon module Creates, installs and searches for modules on the Puppet Forge\. node View and manage node definitions\. parser Interact directly with the parser\. plugin Interact with the Puppet plugin system\. report Create, display, and submit reports\. resource The resource abstraction layer shell status View puppet server status\. (Deprecated) -+agent The puppet agent daemon apply Apply Puppet manifests locally ca Local Puppet Certificate Authority management\. (Deprecated) catalog Compile, save, view, and convert catalogs\. cert Manage certificates and requests certificate Provide access to the CA for certificate management\. certificate_request Manage certificate requests\. (Deprecated) certificate_revocation_list Manage the list of revoked certificates\. (Deprecated) config Interact with Puppet\'s settings\. describe Display help about resource types device Manage remote network devices doc Generate Puppet references epp Interact directly with the EPP template parser/renderer\. facts Retrieve and store facts\. filebucket Store and retrieve files in a filebucket generate Generates Puppet code from Ruby definitions\. help Display Puppet help\. key Create, save, and remove certificate keys\. (Deprecated) lookup Interactive Hiera lookup man Display Puppet manual pages\. master The puppet master daemon module Creates, installs and searches for modules on the Puppet Forge\. node View and manage node definitions\. parser Interact directly with the parser\. plugin Interact with the Puppet plugin system\. report Create, display, and submit reports\. resource The resource abstraction layer shell script Run a puppet manifests as a script without compiling a catalog status View puppet server status\. (Deprecated) - . - .P --See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v5\.0\.0 -+See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v5\.4\.0 diff -Nru puppet-5.4.0/debian/patches/series puppet-5.4.0/debian/patches/series --- puppet-5.4.0/debian/patches/series 2018-04-04 22:03:24.000000000 +0000 +++ puppet-5.4.0/debian/patches/series 2018-04-19 21:06:40.000000000 +0000 @@ -6,4 +6,3 @@ 0007-Fix-service-listing-and-enable-disable-in-Debian.patch 0008-fix-locale-loading.patch reproducible-build.patch -debian-changes diff -Nru puppet-5.4.0/debian/tests/control puppet-5.4.0/debian/tests/control --- puppet-5.4.0/debian/tests/control 2018-04-04 22:03:24.000000000 +0000 +++ puppet-5.4.0/debian/tests/control 2018-04-19 21:06:40.000000000 +0000 @@ -2,7 +2,7 @@ Depends: puppet,ruby-serverspec Restrictions: needs-root,isolation-container -Test-Command: cd debian/tests && rspec spec/puppet-master/*_spec.rb +Test-Command: cd debian/tests && (puppet cert print $(hostname --fqdn) >/dev/null 2>&1 || puppet cert generate $(hostname --fqdn) --dns_alt_names=puppet) && rspec spec/puppet-master/*_spec.rb Depends: puppet-master,ruby-serverspec Restrictions: needs-root,isolation-container @@ -14,6 +14,6 @@ Depends: puppet, systemd-sysv, ruby-serverspec Restrictions: needs-root, isolation-container -Test-Command: cd debian/tests && ./service-setup sysvinit && rspec spec/service-sysvinit/*_spec.rb -Depends: puppet, sysvinit-core, ruby-serverspec -Restrictions: needs-root, isolation-machine, needs-reboot +#Test-Command: cd debian/tests && ./service-setup sysvinit && rspec spec/service-sysvinit/*_spec.rb +#Depends: puppet, sysvinit-core, ruby-serverspec +#Restrictions: needs-root, isolation-machine, needs-reboot diff -Nru puppet-5.4.0/debian/tests/spec/puppet-master-passenger/zz_puppet3_compat_spec.rb puppet-5.4.0/debian/tests/spec/puppet-master-passenger/zz_puppet3_compat_spec.rb --- puppet-5.4.0/debian/tests/spec/puppet-master-passenger/zz_puppet3_compat_spec.rb 2018-04-04 22:03:24.000000000 +0000 +++ puppet-5.4.0/debian/tests/spec/puppet-master-passenger/zz_puppet3_compat_spec.rb 2018-04-19 21:06:31.000000000 +0000 @@ -1,7 +1,7 @@ require 'spec_helper' # Note that this should run after agent.example.com's certificate has been generated -curl_cmd = 'curl --cert /var/lib/puppet/ssl/certs/agent.example.com.pem --key /var/lib/puppet/ssl/private_keys/agent.example.com.pem --cacert /var/lib/puppet/ssl/certs/ca.pem' +curl_cmd = 'curl --noproxy puppet --cert /var/lib/puppet/ssl/certs/agent.example.com.pem --key /var/lib/puppet/ssl/private_keys/agent.example.com.pem --cacert /var/lib/puppet/ssl/certs/ca.pem' describe command("#{curl_cmd} https://puppet:8140/production/status/test") do its(:exit_status) { should eq 0 }