puppet 3.8.7-x86-mingw32 → 4.0.0.rc1-x86-mingw32

data/lib/puppet/vendor/load_deep_merge.rb

@@ -0,0 +1 @@
+$: << File.join([File.dirname(__FILE__), "deep_merge/lib"])

data/lib/puppet/vendor/load_rgen.rb

@@ -1 +1,2 @@
 $: << File.join([File.dirname(__FILE__), "rgen/lib"])
+require 'puppet/vendor/rgen_patch'

data/lib/puppet/vendor/require_vendored.rb

@@ -1,9 +1,7 @@
 # This adds upfront requirements on vendored code found under lib/vendor/x
 # Add one requirement per vendored package (or a comment if it is loaded on demand).
 
-require 'safe_yaml'
-require 'puppet/vendor/safe_yaml_patches'
-
 # The vendored library 'semantic' is loaded on demand.
 # The vendored library 'rgen' is loaded on demand.
 # The vendored library 'pathspec' is loaded on demand.
+# The vendored library 'deep_merge' is loaded on demand.

data/lib/puppet/vendor/rgen_patch.rb

@@ -0,0 +1,132 @@
+# Patch to improve generated addXXX and setXXX method performance
+#
+# Submitted to rgen as PR: https://github.com/mthiede/rgen/pull/22. This
+# patch should be removed once that PR has been included in an rgen
+# release.
+#
+# The current implementation of the generated addXXX method will iterate
+# over the contained array where each iteration will then test for object_id
+# equality. Once the iteration is done and such an entry is found it
+# checks if the added value is an instance of MMBase or MMGeneric. If it
+# is, then it's considered a duplicate and the method returns.
+#
+# This patch changes the implementation so that the test for MMBase/
+# MMGeneric is made prior to the iteration, thus avoiding the iteration
+# alltogether for all non model objects
+#
+# The patch also changes the setXXX method to allow it to optimize the way
+# it ensures that the added elements are unique. Calling the addXXX method
+# to do an increasingly expensive sequential scan is very expensive when
+# large sets of values are assigned.
+#
+require 'rgen/util/name_helper'
+require 'rgen/metamodel_builder/constant_order_helper'
+require 'rgen/metamodel_builder/builder_extensions'
+
+module RGen
+module MetamodelBuilder
+module BuilderExtensions
+
+  def _build_many_methods(props, other_props=nil)
+    name = props.value(:name)
+    other_role = other_props && other_props.value(:name)
+
+    if props.value(:derived)
+      build_derived_method(name, props, :many)
+    else
+      @@many_read_builder ||= ERB.new <<-CODE
+
+          def get<%= firstToUpper(name) %>
+            ( @<%= name %> ? @<%= name %>.dup : [] )
+          end
+          <% if name != "class" %>
+            alias <%= name %> get<%= firstToUpper(name) %>
+          <% end %>
+
+      CODE
+      self::ClassModule.module_eval(@@many_read_builder.result(binding))
+    end
+
+    if props.value(:changeable)
+      @@many_write_builder ||= ERB.new <<-CODE
+
+          def add<%= firstToUpper(name) %>(val, index=-1)
+            @<%= name %> = [] unless @<%= name %>
+            return if val.nil? || (val.is_a?(MMBase) || val.is_a?(MMGeneric)) && @<%= name %>.any? {|e| e.equal?(val)}
+            <%= type_check_code("val", props) %>
+            @<%= name %>.insert(index, val)
+            <% if other_role %>
+              val._register<%= firstToUpper(other_role) %>(self) unless val.is_a?(MMGeneric)
+            <% end %>
+            <% if props.reference? && props.value(:containment) %>
+              val._set_container(self, :<%= name %>)
+            <% end %>
+          end
+
+          def remove<%= firstToUpper(name) %>(val)
+            @<%= name %> = [] unless @<%= name %>
+            @<%= name %>.each_with_index do |e,i|
+              if e.equal?(val)
+                @<%= name %>.delete_at(i)
+                <% if props.reference? && props.value(:containment) %>
+                  val._set_container(nil, nil)
+                <% end %>
+                <% if other_role %>
+                  val._unregister<%= firstToUpper(other_role) %>(self) unless val.is_a?(MMGeneric)
+                <% end %>
+                return
+              end
+            end
+          end
+
+          def set<%= firstToUpper(name) %>(val)
+            return if val.nil?
+            raise _assignmentTypeError(self, val, Enumerable) unless val.is_a? Enumerable
+            get<%= firstToUpper(name) %>.each {|e|
+              remove<%= firstToUpper(name) %>(e)
+            }
+            @<%= name %> = [] unless @<%= name %>
+            <% if props.reference? %>
+            val.uniq {|elem| elem.object_id }.each {|elem|
+              next if elem.nil?
+              <%= type_check_code("elem", props) %>
+              @<%= name %> << elem
+              <% if other_role %>
+                elem._register<%= firstToUpper(other_role) %>(self) unless elem.is_a?(MMGeneric)
+              <% end %>
+              <% if props.value(:containment) %>
+                elem._set_container(self, :<%= name %>)
+              <% end %>
+            }
+            <% else %>
+            val.each {|elem|
+              <%= type_check_code("elem", props) %>
+              @<%= name %> << elem
+           }
+           <% end %>
+          end
+          alias <%= name %>= set<%= firstToUpper(name) %>
+
+          def _register<%= firstToUpper(name) %>(val)
+            @<%= name %> = [] unless @<%= name %>
+            @<%= name %>.push val
+            <% if props.reference? && props.value(:containment) %>
+              val._set_container(self, :<%= name %>)
+            <% end %>
+          end
+
+          def _unregister<%= firstToUpper(name) %>(val)
+            @<%= name %>.delete val
+            <% if props.reference? && props.value(:containment) %>
+              val._set_container(nil, nil)
+            <% end %>
+          end
+
+      CODE
+      self::ClassModule.module_eval(@@many_write_builder.result(binding))
+    end
+  end
+end
+end
+end
+

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '3.8.7'
+  PUPPETVERSION = '4.0.0-rc1'
 
   ##
   # version is a public API method intended to always provide a fast and

data/lib/puppet_x.rb

@@ -0,0 +1,8 @@
+# The Puppet Extensions Module.
+#
+# Submodules of this module should be named after the publisher (e.g. 'user' part of a Puppet Module name).
+#
+# @api public
+#
+module PuppetX
+end

data/lib/semver.rb

@@ -2,7 +2,6 @@ require 'puppet/util/monkey_patches'
 
 # We need to subclass Numeric to force range comparisons not to try to iterate over SemVer
 # and instead use numeric comparisons (eg >, <, >=, <=)
-# Ruby 1.8 already did this for all ranges, but Ruby 1.9 changed range include behavior
 class SemVer < Numeric
   include Comparable
 

data/man/man5/puppet.conf.5

@@ -1,8 +1,8 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPETCONF" "5" "January 2013" "Puppet Labs, LLC" "Puppet manual"
-\fBThis page is autogenerated; any changes will get overwritten\fR \fI(last generated on Tue Jan 15 12:33:09 \-0800 2013)\fR
+.TH "PUPPETCONF" "5" "February 2015" "Puppet Labs, LLC" "Puppet manual"
+\fBThis page is autogenerated; any changes will get overwritten\fR \fI(last generated on 2015\-02\-27 14:27:32 \-0800)\fR
 .
 .SH "Configuration Settings"
 .
@@ -10,7 +10,7 @@
 Each of these settings can be specified in \fBpuppet\.conf\fR or on the command line\.
 .
 .IP "\(bu" 4
-When using boolean settings on the command line, use \fB\-\-setting\fR and \fB\-\-no\-setting\fR instead of \fB\-\-setting (true|false)\fR\.
+When using boolean settings on the command line, use \fB\-\-setting\fR and \fB\-\-no\-setting\fR instead of \fB\-\-setting (true|false)\fR\. (Using \fB\-\-setting false\fR results in "Error: Could not parse application options: needless argument"\.)
 .
 .IP "\(bu" 4
 Settings can be interpolated as \fB$variables\fR in other settings; \fB$environment\fR is special, in that puppet master will interpolate each agent node\'s environment instead of its own\.
@@ -56,8 +56,11 @@ Whether to allow a new certificate request to overwrite an existing certificate\
 .
 .IP "" 0
 .
-.SS "allow_variables_with_dashes"
-Permit hyphens (\fB\-\fR) in variable names and issue deprecation warnings about them\. This setting \fBshould always be \fBfalse\fR;\fR setting it to \fBtrue\fR will cause subtle and wide\-ranging bugs\. It will be removed in a future version\. Hyphenated variables caused major problems in the language, but were allowed between Puppet 2\.7\.3 and 2\.7\.14\. If you used them during this window, we apologize for the inconvenience \-\-\- you can temporarily set this to \fBtrue\fR in order to upgrade, and can rename your variables at your leisure\. Please revert it to \fBfalse\fR after you have renamed all affected variables\.
+.SS "always_cache_features"
+Affects how we cache attempts to load Puppet \'features\'\. If false, then calls to \fBPuppet\.features\.<feature>?\fR will always attempt to load the feature (which can be an expensive operation) unless it has already been loaded successfully\. This makes it possible for a single agent run to, e\.g\., install a package that provides the underlying capabilities for a feature, and then later load that feature during the same run (even if the feature had been tested earlier and had not been available)\.
+.
+.P
+If this setting is set to true, then features will only be checked once, and if they are not available, the negative result is cached and returned for all subsequent attempts to load the feature\. This behavior is almost always appropriate for the server, and can result in a significant performance improvement for features that are checked frequently\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
@@ -80,14 +83,6 @@ During an inspect run, whether to archive files whose contents are audited to a
 .
 .IP "" 0
 .
-.SS "async_storeconfigs"
-Whether to use a queueing system to provide asynchronous database integration\. Requires that \fBpuppet queue\fR be running\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: false
-.
-.IP "" 0
-.
 .SS "autoflush"
 Whether log files should always flush to disk\.
 .
@@ -97,13 +92,39 @@ Whether log files should always flush to disk\.
 .IP "" 0
 .
 .SS "autosign"
-Whether to enable autosign\. Valid values are true (which autosigns any key request, and is a very bad idea), false (which never autosigns any key request), and the path to a file, which uses that configuration file to determine which keys to sign\.
+Whether (and how) to autosign certificate requests\. This setting is only relevant on a puppet master acting as a certificate authority (CA)\.
+.
+.P
+Valid values are true (autosigns all certificate requests; not recommended), false (disables autosigning certificates), or the absolute path to a file\.
+.
+.P
+The file specified in this setting may be either a \fBconfiguration file\fR or a \fBcustom policy executable\.\fR Puppet will automatically determine what it is: If the Puppet user (see the \fBuser\fR setting) can execute the file, it will be treated as a policy executable; otherwise, it will be treated as a config file\.
+.
+.P
+If a custom policy executable is configured, the CA puppet master will run it every time it receives a CSR\. The executable will be passed the subject CN of the request \fIas a command line argument,\fR and the contents of the CSR in PEM format \fIon stdin\.\fR It should exit with a status of 0 if the cert should be autosigned and non\-zero if the cert should not be autosigned\.
+.
+.P
+If a certificate request is not autosigned, it will persist for review\. An admin user can use the \fBpuppet cert sign\fR command to manually sign it, or can delete the request\.
+.
+.P
+For info on autosign configuration files, see the guide to Puppet\'s config files \fIhttp://docs\.puppetlabs\.com/guides/configuring\.html\fR\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $confdir/autosign\.conf
 .
 .IP "" 0
 .
+.SS "basemodulepath"
+The search path for \fBglobal\fR modules\. Should be specified as a list of directories separated by the system path separator character\. (The POSIX path separator is \':\', and the Windows path separator is \';\'\.)
+.
+.P
+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 http://docs\.puppetlabs\.com/puppet/latest/reference/environments\.html
+.
+.IP "\(bu" 4
+\fIDefault\fR: $codedir/modules:/opt/puppetlabs/puppet/modules
+.
+.IP "" 0
+.
 .SS "bindaddress"
 The address a listening server should bind to\.
 .
@@ -111,6 +132,13 @@ The address a listening server should bind to\.
 \fIDefault\fR: 0\.0\.0\.0
 .
 .IP "" 0
+.
+.SS "binder_config"
+The binder configuration file\. Puppet reads this file on each request to configure the bindings system\. If set to nil (the default), a $confdir/binder_config\.yaml is optionally loaded\. If it does not exists, a default configuration is used\. If the setting :binding_config is specified, it must reference a valid and existing yaml file\.
+.
+.TP
+\fIDefault\fR:
+
 .
 .SS "bucketdir"
 Where FileBucket files are stored\.
@@ -153,7 +181,7 @@ The server to use for certificate authority requests\. It\'s a separate server b
 .IP "" 0
 .
 .SS "ca_ttl"
-The default TTL for new certificates\. If this setting is set, ca_days is ignored\. Can be specified as a duration\.
+The default TTL for new certificates\. 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: 5y
@@ -193,7 +221,7 @@ The CA private key\.
 .IP "" 0
 .
 .SS "capass"
-Where the CA stores the password for the private key
+Where the CA stores the password for the private key\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $caprivatedir/ca\.pass
@@ -217,14 +245,11 @@ The CA public key\.
 .IP "" 0
 .
 .SS "catalog_cache_terminus"
-How to store cached catalogs\. Valid values are \'json\' and \'yaml\'\. The agent application defaults to \'json\'\.
+How to store cached catalogs\. Valid values are \'json\', \'msgpack\' and \'yaml\'\. The agent application defaults to \'json\'\.
 .
 .TP
 \fIDefault\fR:
 
-.
-.SS "catalog_format"
-(Deprecated for \'preferred_serialization_format\') What format to use to dump the catalog\. Only supports \'marshal\' and \'yaml\'\. Only matters on the client, since it asks the server for a specific format\.
 .
 .SS "catalog_terminus"
 Where to get node catalogs\. This is useful to change if, for instance, you\'d like to pre\-compile catalogs and store them in memcached or some other easily\-accessed store\.
@@ -235,7 +260,7 @@ Where to get node catalogs\. This is useful to change if, for instance, you\'d l
 .IP "" 0
 .
 .SS "cert_inventory"
-A Complete listing of all certificates
+The inventory file\. This is a text file to which the CA writes a complete listing of all certificates\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $cadir/inventory\.txt
@@ -250,30 +275,44 @@ The certificate directory\.
 .
 .IP "" 0
 .
-.SS "certdnsnames"
-The \fBcertdnsnames\fR setting is no longer functional, after CVE\-2011\-3872\. We ignore the value completely\. For your own certificate request you can set \fBdns_alt_names\fR in the configuration and it will apply locally\. There is no configuration option to set DNS alt names, or any other \fBsubjectAltName\fR value, for another nodes certificate\. Alternately you can use the \fB\-\-dns_alt_names\fR command line option to set the labels added while generating your own CSR\.
+.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\.
 .
-.SS "certificate_expire_warning"
-The window of time leading up to a certificate\'s expiration that a notification will be logged\. This applies to CA, master, and agent certificates\. Can be specified as a duration\.
+.IP "\(bu" 4
+\fIDefault\fR: true
+.
+.IP "" 0
+.
+.SS "certname"
+The name to use when handling certificates\. When a node requests a certificate from the CA puppet master, it uses the value of the \fBcertname\fR setting as its requested Subject CN\.
+.
+.P
+This is the name used when managing a node\'s permissions in auth\.conf \fIhttp://docs\.puppetlabs\.com/puppet/latest/reference/config_file_auth\.html\fR\. In most cases, it is also used as the node\'s name when matching node definitions \fIhttp://docs\.puppetlabs\.com/puppet/latest/reference/lang_node_definitions\.html\fR and requesting data from an ENC\. (This can be changed with the \fBnode_name_value\fR and \fBnode_name_fact\fR settings, although you should only do so if you have a compelling reason\.)
+.
+.P
+A node\'s certname is available in Puppet manifests as \fB$trusted[\'certname\']\fR\. (See Facts and Built\-In Variables \fIhttp://docs\.puppetlabs\.com/puppet/latest/reference/lang_facts_and_builtin_vars\.html\fR for more details\.)
 .
 .IP "\(bu" 4
-\fIDefault\fR: 60d
+For best compatibility, you should limit the value of \fBcertname\fR to only use letters, numbers, periods, underscores, and dashes\. (That is, it should match \fB/A[a\-z0\-9\._\-]+Z/\fR\.)
+.
+.IP "\(bu" 4
+The special value \fBca\fR is reserved, and can\'t be used as the certname for a normal node\.
 .
 .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\.
+.P
+Defaults to the node\'s fully qualified domain name\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: true
+\fIDefault\fR: kylo\.corp\.puppetlabs\.net
 .
 .IP "" 0
 .
-.SS "certname"
-The name to use when handling certificates\. Defaults to the fully qualified domain name\.
+.SS "cfacter"
+Whether or not to use the native facter (cfacter) implementation instead of the Ruby one (facter)\. Defaults to false\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: sirrus\.puppetlabs\.lan
+\fIDefault\fR: false
 .
 .IP "" 0
 .
@@ -310,7 +349,14 @@ The directory in which client\-side YAML data is stored\.
 .IP "" 0
 .
 .SS "code"
-Code to parse directly\. This is essentially only used by \fBpuppet\fR, and should only be set if you\'re writing your own Puppet executable
+Code to parse directly\. This is essentially only used by \fBpuppet\fR, and should only be set if you\'re writing your own Puppet executable\.
+.
+.SS "codedir"
+The main Puppet code directory\. The default for this setting is calculated based on the user\. If the process is running as root or the user that Puppet is supposed to run as, it defaults to a system directory, but if it\'s running as any other user, it defaults to being in the user\'s home directory\.
+.
+.TP
+\fIDefault\fR:
+
 .
 .SS "color"
 Whether to use colors when logging to the console\. Valid values are \fBansi\fR (equivalent to \fBtrue\fR), \fBhtml\fR, and \fBfalse\fR, which produces no color\. Defaults to false on Windows, as its console does not support ansi colors\.
@@ -324,12 +370,12 @@ Whether to use colors when logging to the console\. Valid values are \fBansi\fR
 The main Puppet configuration directory\. The default for this setting is calculated based on the user\. If the process is running as root or the user that Puppet is supposed to run as, it defaults to a system directory, but if it\'s running as any other user, it defaults to being in the user\'s home directory\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: /etc/puppet
+\fIDefault\fR: /etc/puppetlabs/puppet
 .
 .IP "" 0
 .
 .SS "config"
-The configuration file for the current puppet application
+The configuration file for the current puppet application\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $confdir/${config_file_name}
@@ -347,22 +393,34 @@ The name of the puppet config file\.
 .SS "config_version"
 How to determine the configuration version\. By default, it will be the time that the configuration is parsed, but you can provide a shell script to override how the version is determined\. The output of this script will be added to every log message in the reports, allowing you to correlate changes on your hosts to the source version on the server\.
 .
+.P
+Setting a global value for config_version in puppet\.conf is not allowed (but it can be overridden from the commandline)\. Please set a per\-environment value in environment\.conf instead\. For more info, see http://docs\.puppetlabs\.com/puppet/latest/reference/environments\.html
+.
 .SS "configprint"
 Print the value of a specific configuration setting\. If the name of a setting is provided for this, then the value is printed and puppet exits\. Comma\-separate multiple values\. For a list of all values, specify \'all\'\.
 .
 .SS "configtimeout"
-How long the client should wait for the configuration to be retrieved before considering it a failure\. This can help reduce flapping if too many clients contact the server at one time\. Can be specified as a duration\.
+How long the client should wait for the configuration to be retrieved before considering it a failure\. This setting is deprecated and has been replaced by http_connect_timeout and http_read_timeout\. 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: 2m
 .
 .IP "" 0
 .
-.SS "couchdb_url"
-The url where the puppet couchdb database will be created
+.SS "csr_attributes"
+An optional file containing custom attributes to add to certificate signing requests (CSRs)\. You should ensure that this file does not exist on your CA puppet master; if it does, unwanted certificate extensions may leak into certificates created with the \fBpuppet cert generate\fR command\.
+.
+.P
+If present, this file must be a YAML hash containing a \fBcustom_attributes\fR key and/or an \fBextension_requests\fR key\. The value of each key must be a hash, where each key is a valid OID and each value is an object that can be cast to a string\.
+.
+.P
+Custom attributes can be used by the CA when deciding whether to sign the certificate, but are then discarded\. Attribute OIDs can be any OID value except the standard CSR attributes (i\.e\. attributes described in RFC 2985 section 5\.4)\. This is useful for embedding a pre\-shared key for autosigning policy executables (see the \fBautosign\fR setting), often by using the \fB1\.2\.840\.113549\.1\.9\.7\fR ("challenge password") OID\.
+.
+.P
+Extension requests will be permanently embedded in the final certificate\. Extension OIDs must be in the "ppRegCertExt" (\fB1\.3\.6\.1\.4\.1\.34380\.1\.1\fR) or "ppPrivCertExt" (\fB1\.3\.6\.1\.4\.1\.34380\.1\.2\fR) OID arcs\. The ppRegCertExt arc is reserved for four of the most common pieces of data to embed: \fBpp_uuid\fR (\fB\.1\fR), \fBpp_instance_id\fR (\fB\.2\fR), \fBpp_image_name\fR (\fB\.3\fR), and \fBpp_preshared_key\fR (\fB\.4\fR) \-\-\- in the YAML file, these can be referred to by their short descriptive names instead of their full OID\. The ppPrivCertExt arc is unregulated, and can be used for site\-specific extensions\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: http://127\.0\.0\.1:5984/puppet
+\fIDefault\fR: $confdir/csr_attributes\.yaml
 .
 .IP "" 0
 .
@@ -390,135 +448,159 @@ Where to retrive information about data\.
 .
 .IP "" 0
 .
-.SS "dbadapter"
-The type of database to use\.
+.SS "default_file_terminus"
+The default source for files if no server is given in a uri, e\.g\. puppet:///file\. The default of \fBrest\fR causes the file to be retrieved using the \fBserver\fR setting\. When running \fBapply\fR the default is \fBfile_server\fR, causing requests to be filled locally\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: sqlite3
+\fIDefault\fR: rest
 .
 .IP "" 0
 .
-.SS "dbconnections"
-The number of database connections for networked databases\. Will be ignored unless the value is a positive integer\.
+.SS "default_manifest"
+The default main manifest for directory environments\. Any environment that doesn\'t set the \fBmanifest\fR setting in its \fBenvironment\.conf\fR file will use this manifest\.
+.
+.P
+This setting\'s value can be an absolute or relative path\. An absolute path will make all environments default to the same main manifest; a relative path will allow each environment to use its own manifest, and Puppet will resolve the path relative to each environment\'s main directory\.
 .
-.SS "dblocation"
-The database cache for client configurations\. Used for querying within the language\.
+.P
+In either case, the path can point to a single file or to a directory of manifests to be evaluated in alphabetical order\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: $statedir/clientconfigs\.sqlite3
+\fIDefault\fR: \./manifests
 .
 .IP "" 0
 .
-.SS "dbmigrate"
-Whether to automatically migrate the database\.
+.SS "default_schedules"
+Boolean; whether to generate the default schedule resources\. Setting this to false is useful for keeping external report processors clean of skipped schedule resources\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: false
+\fIDefault\fR: true
 .
 .IP "" 0
 .
-.SS "dbname"
-The name of the database to use\.
+.SS "deviceconfig"
+Path to the device config file for puppet device\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: puppet
+\fIDefault\fR: $confdir/device\.conf
 .
 .IP "" 0
 .
-.SS "dbpassword"
-The database password for caching\. Only used when networked databases are used\.
+.SS "devicedir"
+The root directory of devices\' $vardir\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: puppet
+\fIDefault\fR: $vardir/devices
 .
 .IP "" 0
 .
-.SS "dbport"
-The database password for caching\. Only used when networked databases are used\.
-.
-.SS "dbserver"
-The database server for caching\. Only used when networked databases are used\.
+.SS "diff"
+Which diff command to use when printing differences between files\. This setting has no default value on Windows, as standard \fBdiff\fR is not available, but Puppet can use many third\-party diff tools\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: localhost
+\fIDefault\fR: diff
 .
 .IP "" 0
 .
-.SS "dbsocket"
-The database socket location\. Only used when networked databases are used\. Will be ignored if the value is an empty string\.
-.
-.SS "dbuser"
-The database user for caching\. Only used when networked databases are used\.
+.SS "diff_args"
+Which arguments to pass to the diff command when printing differences between files\. The command to use can be chosen with the \fBdiff\fR setting\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: puppet
+\fIDefault\fR: \-u
 .
 .IP "" 0
 .
-.SS "default_file_terminus"
-The default source for files if no server is given in a uri, e\.g\. puppet:///file\. The default of \fBrest\fR causes the file to be retrieved using the \fBserver\fR setting\. When running \fBapply\fR the default is \fBfile_server\fR, causing requests to be filled locally\.
+.SS "digest_algorithm"
+Which digest algorithm to use for file resources and the filebucket\. Valid values are md5, sha256\. Default is md5\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: rest
+\fIDefault\fR: md5
 .
 .IP "" 0
 .
-.SS "deviceconfig"
-Path to the device config file for puppet device
+.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\.
+.
+.P
+This setting requires \fBdefault_manifest\fR to be set to an absolute path\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: $confdir/device\.conf
+\fIDefault\fR: false
 .
 .IP "" 0
 .
-.SS "devicedir"
-The root directory of devices\' $vardir
+.SS "disable_warnings"
+A comma\-separated list of warning types to suppress\. If large numbers of warnings are making Puppet\'s logs too large or difficult to use, you can temporarily silence them with this setting\.
+.
+.P
+If you are preparing to upgrade Puppet to a new major version, you should re\-enable all warnings for a while\.
+.
+.P
+Valid values for this setting are:
 .
 .IP "\(bu" 4
-\fIDefault\fR: $vardir/devices
+\fBdeprecations\fR \-\-\- disables deprecation warnings\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: []
 .
 .IP "" 0
 .
-.SS "diff"
-Which diff command to use when printing differences between files\. This setting has no default value on Windows, as standard \fBdiff\fR is not available, but Puppet can use many third\-party diff tools\.
+.SS "dns_alt_names"
+The comma\-separated list of alternative DNS names to use for the local host\.
+.
+.P
+When the node generates a CSR for itself, these are added to the request as the desired \fBsubjectAltName\fR in the certificate: additional DNS labels that the certificate is also valid answering as\.
+.
+.P
+This is generally required if you use a non\-hostname \fBcertname\fR, or if you want to use \fBpuppet kick\fR or \fBpuppet resource \-H\fR and the primary certname does not match the DNS name you use to communicate with the host\.
+.
+.P
+This is unnecessary for agents, unless you intend to use them as a server for \fBpuppet kick\fR or remote \fBpuppet resource\fR management\.
+.
+.P
+It is rarely necessary for servers; it is usually helpful only if you need to have a pool of multiple load balanced masters, or for the same master to respond on two physically separate networks under different names\.
+.
+.SS "document_all"
+Whether to document all resources when using \fBpuppet doc\fR to generate manifest documentation\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: diff
+\fIDefault\fR: false
 .
 .IP "" 0
 .
-.SS "diff_args"
-Which arguments to pass to the diff command when printing differences between files\. The command to use can be chosen with the \fBdiff\fR setting\.
+.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\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: \-u
+\fIDefault\fR: production
 .
 .IP "" 0
 .
-.SS "dns_alt_names"
-The comma\-separated list of alternative DNS names to use for the local host\. When the node generates a CSR for itself, these are added to the request as the desired \fBsubjectAltName\fR in the certificate: additional DNS labels that the certificate is also valid answering as\. This is generally required if you use a non\-hostname \fBcertname\fR, or if you want to use \fBpuppet kick\fR or \fBpuppet resource \-H\fR and the primary certname does not match the DNS name you use to communicate with the host\. This is unnecessary for agents, unless you intend to use them as a server for \fBpuppet kick\fR or remote \fBpuppet resource\fR management\. It is rarely necessary for servers; it is usually helpful only if you need to have a pool of multiple load balanced masters, or for the same master to respond on two physically separate networks under different names\.
-.
-.SS "document_all"
-Document all resources
+.SS "environment_data_provider"
+The name of a registered environment data provider\. The two built in and registered providers are \'none\' (no environment specific data), and \'function\' (environment specific data obtained by calling the function \'environment::data()\')\. Other environment data providers may be registered in modules on the module path\. For such custom data providers see the respective module documentation\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: false
+\fIDefault\fR: none
 .
 .IP "" 0
 .
-.SS "dynamicfacts"
-(Deprecated) Facts that are dynamic; these facts will be ignored when deciding whether changed facts should result in a recompile\. Multiple facts should be comma\-separated\.
+.SS "environment_timeout"
+The time to live for a cached environment\. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y)\. This setting can also be set to \fBunlimited\fR, which causes the environment to be cached until the master is restarted\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: memorysize,memoryfree,swapsize,swapfree
+\fIDefault\fR: unlimited
 .
 .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\.
+.SS "environmentpath"
+A search path for directory environments, as a list of directories separated by the system path separator character\. (The POSIX path separator is \':\', and the Windows path separator is \';\'\.)
+.
+.P
+This setting must have a value set to enable \fBdirectory environments\.\fR The recommended value is \fB$codedir/environments\fR\. For more details, see http://docs\.puppetlabs\.com/puppet/latest/reference/environments\.html
 .
 .IP "\(bu" 4
-\fIDefault\fR: production
+\fIDefault\fR: $codedir/environments
 .
 .IP "" 0
 .
@@ -531,7 +613,10 @@ Whether each resource should log when it is being evaluated\. This allows you to
 .IP "" 0
 .
 .SS "external_nodes"
-An external command that can produce node information\. The command\'s output must be a YAML dump of a hash, and that hash must have a \fBclasses\fR key and/or a \fBparameters\fR key, where \fBclasses\fR is an array or hash and \fBparameters\fR is a hash\. For unknown nodes, the command should exit with a non\-zero exit code\. This command makes it straightforward to store your node mapping information in other data sources like databases\.
+An external command that can produce node information\. The command\'s output must be a YAML dump of a hash, and that hash must have a \fBclasses\fR key and/or a \fBparameters\fR key, where \fBclasses\fR is an array or hash and \fBparameters\fR is a hash\. For unknown nodes, the command should exit with a non\-zero exit code\.
+.
+.P
+This command makes it straightforward to store your node mapping information in other data sources like databases\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: none
@@ -563,12 +648,19 @@ Where the fileserver configuration is stored\.
 .IP "" 0
 .
 .SS "filetimeout"
-The minimum time to wait between checking for updates in configuration files\. This timeout determines how quickly Puppet checks whether a file (such as manifests or templates) has changed on disk\. Can be specified as a duration\.
+The minimum time to wait between checking for updates in configuration files\. This timeout determines how quickly Puppet checks whether a file (such as manifests or templates) has changed on disk\. 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: 15s
 .
 .IP "" 0
+.
+.SS "forge_authorization"
+The authorization key to connect to the Puppet Forge\. Leave blank for unauthorized or license based connections
+.
+.TP
+\fIDefault\fR:
+
 .
 .SS "freeze_main"
 Freezes the \'main\' class, disallowing any code to be added to it\. This essentially means that you can\'t have any code outside of a node, class, or definition other than in the site manifest\.
@@ -579,7 +671,7 @@ Freezes the \'main\' class, disallowing any code to be added to it\. This essent
 .IP "" 0
 .
 .SS "genconfig"
-Whether to just print a configuration to stdout and exit\. Only makes sense when used interactively\. Takes into account arguments specified on the CLI\.
+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\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
@@ -587,7 +679,7 @@ Whether to just print a configuration to stdout and exit\. Only makes sense when
 .IP "" 0
 .
 .SS "genmanifest"
-Whether to just print a manifest to stdout and exit\. Only makes sense when used interactively\. Takes into account arguments specified on the CLI\.
+Whether to just print a manifest to stdout and exit\. Only makes sense when specified on the command line as \fB\-\-genmanifest\fR\. Takes into account arguments specified on the CLI\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
@@ -619,10 +711,10 @@ The group puppet master should run as\.
 .IP "" 0
 .
 .SS "hiera_config"
-The hiera configuration file
+The hiera configuration file\. Puppet only reads this file on startup, so you must restart the puppet master every time you edit it\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: $confdir/hiera\.yaml
+\fIDefault\fR: $codedir/hiera\.yaml
 .
 .IP "" 0
 .
@@ -666,83 +758,93 @@ Where individual hosts store and look for their public key\.
 .
 .IP "" 0
 .
-.SS "http_compression"
-Allow http compression in REST communication with the master\. This setting might improve performance for agent \-> master communications over slow WANs\. Your puppet master needs to support compression (usually by activating some settings in a reverse\-proxy in front of the puppet master, which rules out webrick)\. It is harmless to activate this settings if your master doesn\'t support compression, but if it supports it, this setting might reduce performance on high\-speed LANs\.
+.SS "http_connect_timeout"
+The maximum amount of time to wait when establishing an HTTP connection\. The default value is 2 minutes\. 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: false
+\fIDefault\fR: 2m
 .
 .IP "" 0
 .
-.SS "http_proxy_host"
-The HTTP proxy host to use for outgoing connections\. Note: You may need to use a FQDN for the server hostname when using a proxy\.
+.SS "http_debug"
+Whether to write HTTP request and responses to stderr\. This should never be used in a production environment\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: none
+\fIDefault\fR: false
 .
 .IP "" 0
 .
-.SS "http_proxy_port"
-The HTTP proxy port to use for outgoing connections
+.SS "http_keepalive_timeout"
+The maximum amount of time a persistent HTTP connection can remain idle in the connection pool, before it is closed\. This timeout should be shorter than the keepalive timeout used on the HTTP server, e\.g\. Apache KeepAliveTimeout directive\. 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: 3128
+\fIDefault\fR: 4s
 .
 .IP "" 0
 .
-.SS "httplog"
-Where the puppet agent web server logs\.
+.SS "http_proxy_host"
+The HTTP proxy host to use for outgoing connections\. Note: You may need to use a FQDN for the server hostname when using a proxy\. Environment variable http_proxy or HTTP_PROXY will override this value
 .
 .IP "\(bu" 4
-\fIDefault\fR: $logdir/http\.log
+\fIDefault\fR: none
 .
 .IP "" 0
 .
-.SS "ignorecache"
-Ignore cache and always recompile the configuration\. This is useful for testing new configurations, where the local cache may in fact be stale even if the timestamps are up to date \- if the facts change or if the server changes\.
+.SS "http_proxy_password"
+The password for the user of an authenticated HTTP proxy\. Requires the \fBhttp_proxy_user\fR setting\.
+.
+.P
+Note that passwords must be valid when used as part of a URL\. If a password contains any characters with special meanings in URLs (as specified by RFC 3986 section 2\.2), they must be URL\-encoded\. (For example, \fB#\fR would become \fB%23\fR\.)
 .
 .IP "\(bu" 4
-\fIDefault\fR: false
+\fIDefault\fR: none
 .
 .IP "" 0
 .
-.SS "ignoreimport"
-If true, allows the parser to continue without requiring all files referenced with \fBimport\fR statements to exist\. This setting was primarily designed for use with commit hooks for parse\-checking\.
+.SS "http_proxy_port"
+The HTTP proxy port to use for outgoing connections
 .
 .IP "\(bu" 4
-\fIDefault\fR: false
+\fIDefault\fR: 3128
 .
 .IP "" 0
 .
-.SS "ignoreschedules"
-Boolean; whether puppet agent should ignore schedules\. This is useful for initial puppet agent runs\.
+.SS "http_proxy_user"
+The user name for an authenticated HTTP proxy\. Requires the \fBhttp_proxy_host\fR setting\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: false
+\fIDefault\fR: none
 .
 .IP "" 0
 .
-.SS "inventory_port"
-The port to communicate with the inventory_server\.
+.SS "http_read_timeout"
+The time to wait for one block to be read from an HTTP connection\. If nothing is read after the elapsed interval then the connection will be closed\. The default value is unlimited\. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y)\.
+.
+.TP
+\fIDefault\fR:
+
+.
+.SS "ignorecache"
+Ignore cache and always recompile the configuration\. This is useful for testing new configurations, where the local cache may in fact be stale even if the timestamps are up to date \- if the facts change or if the server changes\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: $masterport
+\fIDefault\fR: false
 .
 .IP "" 0
 .
-.SS "inventory_server"
-The server to send facts to\.
+.SS "ignoremissingtypes"
+Skip searching for classes and definitions that were missing during a prior compilation\. The list of missing objects is maintained per\-environment and persists until the environment is cleared or the master is restarted\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: $server
+\fIDefault\fR: false
 .
 .IP "" 0
 .
-.SS "inventory_terminus"
-Should usually be the same as the facts terminus
+.SS "ignoreschedules"
+Boolean; whether puppet agent should ignore schedules\. This is useful for initial puppet agent runs\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: $facts_terminus
+\fIDefault\fR: false
 .
 .IP "" 0
 .
@@ -859,27 +961,43 @@ An extra search path for Puppet\. This is only useful for those files that Puppe
 .
 .IP "" 0
 .
-.SS "listen"
-Whether puppet agent should listen for connections\. If this is true, then puppet agent will accept incoming REST API requests, subject to the default ACLs and the ACLs set in the \fBrest_authconfig\fR file\. Puppet agent can respond usefully to requests on the \fBrun\fR, \fBfacts\fR, \fBcertificate\fR, and \fBresource\fR endpoints\.
+.SS "localcacert"
+Where each client stores the CA certificate\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: false
+\fIDefault\fR: $certdir/ca\.pem
 .
 .IP "" 0
 .
-.SS "localcacert"
-Where each client stores the CA certificate\.
+.SS "log_level"
+Default logging level for messages from Puppet\. Allowed values are:
 .
 .IP "\(bu" 4
-\fIDefault\fR: $certdir/ca\.pem
+debug
 .
-.IP "" 0
+.IP "\(bu" 4
+info
+.
+.IP "\(bu" 4
+notice
 .
-.SS "localconfig"
-Where puppet agent caches the local configuration\. An extension indicating the cache format is added automatically\.
+.IP "\(bu" 4
+warning
+.
+.IP "\(bu" 4
+err
 .
 .IP "\(bu" 4
-\fIDefault\fR: $statedir/localconfig
+alert
+.
+.IP "\(bu" 4
+emerg
+.
+.IP "\(bu" 4
+crit
+.
+.IP "\(bu" 4
+\fIDefault\fR: notice
 .
 .IP "" 0
 .
@@ -899,42 +1017,60 @@ Whether Puppet should manage the owner, group, and mode of files it uses interna
 .IP "" 0
 .
 .SS "manifest"
-The entry\-point manifest for puppet master\.
+The entry\-point manifest for puppet master\. This can be one file or a directory of manifests to be evaluated in alphabetical order\. Puppet manages this path as a directory if one exists or if the path ends with a / or \.
 .
-.IP "\(bu" 4
-\fIDefault\fR: $manifestdir/site\.pp
+.P
+Setting a global value for \fBmanifest\fR in puppet\.conf is not allowed (but it can be overridden from them commandline)\. Please use directory environments instead\. If you need to use something other than the environment\'s \fBmanifests\fR directory as the main manifest, you can set \fBmanifest\fR in environment\.conf\. For more info, see http://docs\.puppetlabs\.com/puppet/latest/reference/environments\.html
 .
-.IP "" 0
+.TP
+\fIDefault\fR:
+
 .
-.SS "manifestdir"
-Where puppet master looks for its manifests\.
+.SS "master_url_prefix"
+The prefix at which the puppet master API is mounted\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: $confdir/manifests
+\fIDefault\fR: /puppet
 .
 .IP "" 0
 .
 .SS "masterhttplog"
-Where the puppet master web server logs\.
+Where the puppet master web server saves its access log\. This is only used when running a WEBrick puppet master\. When puppet master is running under a Rack server like Passenger, that web server will have its own logging behavior\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $logdir/masterhttp\.log
 .
 .IP "" 0
 .
-.SS "masterlog"
-Where puppet master logs\. This is generally not used, since syslog is the default log destination\.
+.SS "masterport"
+The port for puppet master traffic\. For puppet master, this is the port to listen on; for puppet agent, this is the port to make requests on\. Both applications use this setting to get the port\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: 8140
+.
+.IP "" 0
+.
+.SS "max_deprecations"
+Sets the max number of logged/displayed parser validation deprecation warnings in case multiple deprecation warnings have been detected\. A value of 0 blocks the logging of deprecation warnings\. The count is per manifest\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: $logdir/puppetmaster\.log
+\fIDefault\fR: 10
 .
 .IP "" 0
 .
-.SS "masterport"
-Which port puppet master listens on\.
+.SS "max_errors"
+Sets the max number of logged/displayed parser validation errors in case multiple errors have been detected\. A value of 0 is the same as a value of 1; a minimum of one error is always raised\. The count is per manifest\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: 8140
+\fIDefault\fR: 10
+.
+.IP "" 0
+.
+.SS "max_warnings"
+Sets the max number of logged/displayed parser validation warnings in case multiple warnings have been detected\. A value of 0 blocks logging of warnings\. The count is per manifest\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: 10
 .
 .IP "" 0
 .
@@ -953,12 +1089,27 @@ Whether to create the necessary user and group that puppet agent will run as\.
 \fIDefault\fR: false
 .
 .IP "" 0
+.
+.SS "module_groups"
+Extra module groups to request from the Puppet Forge
+.
+.TP
+\fIDefault\fR:
+
 .
 .SS "module_repository"
 The module repository
 .
 .IP "\(bu" 4
-\fIDefault\fR: https://forge\.puppetlabs\.com
+\fIDefault\fR: https://forgeapi\.puppetlabs\.com
+.
+.IP "" 0
+.
+.SS "module_skeleton_dir"
+The directory which the skeleton for module tool generate is stored\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: $module_working_dir/skeleton
 .
 .IP "" 0
 .
@@ -973,10 +1124,8 @@ The directory into which module tool data is stored
 .SS "modulepath"
 The search path for modules, as a list of directories separated by the system path separator character\. (The POSIX path separator is \':\', and the Windows path separator is \';\'\.)
 .
-.IP "\(bu" 4
-\fIDefault\fR: $confdir/modules:/usr/share/puppet/modules
-.
-.IP "" 0
+.P
+Setting a global value for \fBmodulepath\fR in puppet\.conf is not allowed (but it can be overridden from the commandline)\. Please use directory environments instead\. If you need to use something other than the default modulepath of \fB<ACTIVE ENVIRONMENT\'S MODULES DIR>:$basemodulepath\fR, you can set \fBmodulepath\fR in environment\.conf\. For more info, see http://docs\.puppetlabs\.com/puppet/latest/reference/environments\.html
 .
 .SS "name"
 The name of the application, if we are running as one\. The default is essentially $0 without the path or \fB\.rb\fR\.
@@ -986,7 +1135,7 @@ The name of the application, if we are running as one\. The default is essential
 
 .
 .SS "node_cache_terminus"
-How to store cached nodes\. Valid values are (none), \'json\', \'yaml\' or write only yaml (\'write_only_yaml\')\. The master application defaults to \'write_only_yaml\', all others to none\.
+How to store cached nodes\. Valid values are (none), \'json\', \'msgpack\', \'yaml\' or write only yaml (\'write_only_yaml\')\. The master application defaults to \'write_only_yaml\', all others to none\.
 .
 .TP
 \fIDefault\fR:
@@ -1020,7 +1169,13 @@ Where to find information about nodes\.
 .IP "" 0
 .
 .SS "noop"
-Whether puppet agent should be run in noop mode\.
+Whether to apply catalogs in noop mode, which allows Puppet to partially simulate a normal run\. This setting affects puppet agent and puppet apply\.
+.
+.P
+When running in noop mode, Puppet will check whether each resource is in sync, like it does when running normally\. However, if a resource attribute is not in the desired state (as declared in the catalog), Puppet will take no action, and will instead report the changes it \fIwould\fR have made\. These simulated changes will appear in the report sent to the puppet master, or be shown on the console if running puppet agent or puppet apply in the foreground\. The simulated changes will not send refresh events to any subscribing or notified resources, although Puppet will log that a refresh event \fIwould\fR have been sent\.
+.
+.P
+\fBImportant note:\fR The \fBnoop\fR metaparameter \fIhttp://docs\.puppetlabs\.com/references/latest/metaparameter\.html#noop\fR allows you to apply individual resources in noop mode, and will override the global value of the \fBnoop\fR setting\. This means a resource with \fBnoop => false\fR \fIwill\fR be changed if necessary, even when running puppet agent with \fBnoop = true\fR or \fB\-\-noop\fR\. (Conversely, a resource with \fBnoop => true\fR will only be simulated, even when noop mode is globally disabled\.)
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
@@ -1028,13 +1183,35 @@ Whether puppet agent should be run in noop mode\.
 .IP "" 0
 .
 .SS "onetime"
-Run the configuration once, rather than as a long\-running daemon\. This is useful for interactively running puppetd\.
+Perform one configuration run and exit, rather than spawning a long\-running daemon\. This is useful for interactively running puppet agent, or running puppet agent from cron\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
+.SS "ordering"
+How unrelated resources should be ordered when applying a catalog\. Allowed values are \fBtitle\-hash\fR, \fBmanifest\fR, and \fBrandom\fR\. This setting affects puppet agent and puppet apply, but not puppet master\.
+.
+.IP "\(bu" 4
+\fBmanifest\fR (the default) will use the order in which the resources were declared in their manifest files\.
+.
+.IP "\(bu" 4
+\fBtitle\-hash\fR (the default in 3\.x) will order resources randomly, but will use the same order across runs and across nodes\. It is only of value if you\'re migrating from 3\.x and have errors running with \fBmanifest\fR\.
+.
+.IP "\(bu" 4
+\fBrandom\fR will order resources randomly and change their order with each run\. This can work like a fuzzer for shaking out undeclared dependencies\.
+.
+.IP "" 0
+.
+.P
+Regardless of this setting\'s value, Puppet will always obey explicit dependencies set with the before/require/notify/subscribe metaparameters and the \fB\->\fR/\fB~>\fR chaining arrows; this setting only affects the relative ordering of \fIunrelated\fR resources\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: manifest
+.
+.IP "" 0
+.
 .SS "passfile"
 Where puppet agent stores the password for its private key\. Generally unused\.
 .
@@ -1046,6 +1223,9 @@ Where puppet agent stores the password for its private key\. Generally unused\.
 .SS "path"
 The shell search path\. Defaults to whatever is inherited from the parent process\.
 .
+.P
+This setting can only be set in the \fB[main]\fR section of puppet\.conf; it cannot be set in \fB[master]\fR, \fB[agent]\fR, or an environment config section\.
+.
 .IP "\(bu" 4
 \fIDefault\fR: none
 .
@@ -1067,6 +1247,22 @@ Where Puppet should store plugins that it pulls down from the central server\.
 .
 .IP "" 0
 .
+.SS "pluginfactdest"
+Where Puppet should store external facts that are being handled by pluginsync
+.
+.IP "\(bu" 4
+\fIDefault\fR: $vardir/facts\.d
+.
+.IP "" 0
+.
+.SS "pluginfactsource"
+Where to retrieve external facts for pluginsync
+.
+.IP "\(bu" 4
+\fIDefault\fR: puppet:///pluginfacts
+.
+.IP "" 0
+.
 .SS "pluginsignore"
 What files to ignore when pulling down plugins\.
 .
@@ -1079,7 +1275,7 @@ What files to ignore when pulling down plugins\.
 From where to retrieve plugins\. 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://$server/plugins
+\fIDefault\fR: puppet:///plugins
 .
 .IP "" 0
 .
@@ -1104,6 +1300,13 @@ The preferred means of serializing ruby instances for passing over the wire\. Th
 .
 .SS "prerun_command"
 A command to run before every agent run\. If this command returns a non\-zero return code, the entire Puppet run will fail\.
+.
+.SS "priority"
+The scheduling priority of the process\. Valid values are \'high\', \'normal\', \'low\', or \'idle\', which are mapped to platform\-specific values\. The priority can also be specified as an integer value and will be passed as is, e\.g\. \-5\. Puppet must be running as a privileged user in order to increase scheduling priority\.
+.
+.TP
+\fIDefault\fR:
+
 .
 .SS "privatedir"
 Where the client stores private certificate information\.
@@ -1121,59 +1324,33 @@ The private key directory\.
 .
 .IP "" 0
 .
-.SS "publickeydir"
-The public key directory\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: $ssldir/public_keys
-.
-.IP "" 0
-.
-.SS "puppetdlog"
-The log file for puppet agent\. This is generally not used\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: $logdir/puppetd\.log
-.
-.IP "" 0
-.
-.SS "puppetport"
-Which port puppet agent listens on\.
+.SS "profile"
+Whether to enable experimental performance profiling
 .
 .IP "\(bu" 4
-\fIDefault\fR: 8139
-.
-.IP "" 0
-.
-.SS "queue_source"
-Which type of queue to use for asynchronous processing\. If your stomp server requires authentication, you can include it in the URI as long as your stomp client library is at least 1\.1\.1
-.
-.IP "\(bu" 4
-\fIDefault\fR: stomp://localhost:61613/
+\fIDefault\fR: false
 .
 .IP "" 0
 .
-.SS "queue_type"
-Which type of queue to use for asynchronous processing\.
+.SS "publickeydir"
+The public key directory\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: stomp
+\fIDefault\fR: $ssldir/public_keys
 .
 .IP "" 0
 .
-.SS "rails_loglevel"
-The log level for Rails connections\. The value must be a valid log level within Rails\. Production environments normally use \fBinfo\fR and other environments normally use \fBdebug\fR\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: info
+.SS "puppetdlog"
+The fallback log file\. This is only used when the \fB\-\-logdest\fR option is not specified AND Puppet is running on an operating system where both the POSIX syslog service and the Windows Event Log are unavailable\. (Currently, no supported operating systems match that description\.)
 .
-.IP "" 0
+.P
+Despite the name, both puppet agent and puppet master will use this file as the fallback logging destination\.
 .
-.SS "railslog"
-Where Rails\-specific logs are sent
+.P
+For control over logging destinations, see the \fB\-\-logdest\fR command line option in the manual pages for puppet master, puppet agent, and puppet apply\. You can see man pages by running \fBpuppet <SUBCOMMAND> \-\-help\fR, or read them online at http://docs\.puppetlabs\.com/references/latest/man/\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: $logdir/rails\.log
+\fIDefault\fR: $logdir/puppetd\.log
 .
 .IP "" 0
 .
@@ -1202,23 +1379,21 @@ The server to send transaction reports to\.
 .IP "" 0
 .
 .SS "reportdir"
-The directory in which to store reports received from the client\. Each client gets a separate subdirectory\.
+The directory in which to store reports\. Each node gets a separate subdirectory in this directory\. This setting is only used when the \fBstore\fR report processor is enabled (see the \fBreports\fR setting)\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $vardir/reports
 .
 .IP "" 0
 .
-.SS "reportfrom"
-The \'from\' email address for the reports\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: report@sirrus\.puppetlabs\.lan
+.SS "reports"
+The list of report handlers to use\. When using multiple report handlers, their names should be comma\-separated, with whitespace allowed\. (For example, \fBreports = http, store\fR\.)
 .
-.IP "" 0
+.P
+This setting is relevant to puppet master and puppet apply\. The puppet master will call these report handlers with the reports it receives from agent nodes, and puppet apply will call them with its own report\. (In all cases, the node applying the catalog must have \fBreport = true\fR\.)
 .
-.SS "reports"
-The list of reports to generate\. All reports are looked for in \fBpuppet/reports/name\.rb\fR, and multiple report names should be comma\-separated (whitespace is okay)\.
+.P
+See the report reference for information on the built\-in report handlers; custom report handlers can also be loaded from modules\. (Report handlers are loaded from the lib directory, at \fBpuppet/reports/NAME\.rb\fR\.)
 .
 .IP "\(bu" 4
 \fIDefault\fR: store
@@ -1226,7 +1401,7 @@ The list of reports to generate\. All reports are looked for in \fBpuppet/report
 .IP "" 0
 .
 .SS "reporturl"
-The URL used by the http reports processor to send reports
+The URL that reports should be forwarded to\. This setting is only used when the \fBhttp\fR report processor is enabled (see the \fBreports\fR setting)\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: http://localhost:3000/reports/upload
@@ -1273,22 +1448,6 @@ The YAML file containing indirector route configuration\.
 .
 .IP "" 0
 .
-.SS "rrddir"
-The directory where RRD database files are stored\. Directories for each reporting host will be created under this directory\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: $vardir/rrd
-.
-.IP "" 0
-.
-.SS "rrdinterval"
-How often RRD should expect data\. This should match how often the hosts report back to the server\. Can be specified as a duration\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: $runinterval
-.
-.IP "" 0
-.
 .SS "rundir"
 Where Puppet PID files are kept\.
 .
@@ -1297,21 +1456,13 @@ Where Puppet PID files are kept\.
 
 .
 .SS "runinterval"
-How often puppet agent applies the client configuration; in seconds\. Note that a runinterval of 0 means "run continuously" rather than "never run\." If you want puppet agent to never run, you should start it with the \fB\-\-no\-client\fR option\. Can be specified as a duration\.
+How often puppet agent applies the catalog\. Note that a runinterval of 0 means "run continuously" rather than "never run\." If you want puppet agent to never run, you should start it with the \fB\-\-no\-client\fR option\. 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: 30m
 .
 .IP "" 0
 .
-.SS "sendmail"
-Where to find the sendmail binary with which to send email\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: /usr/sbin/sendmail
-.
-.IP "" 0
-.
 .SS "serial"
 Where the serial number for certificates is stored\.
 .
@@ -1321,7 +1472,7 @@ Where the serial number for certificates is stored\.
 .IP "" 0
 .
 .SS "server"
-The server to which the puppet agent should connect
+The puppet master server to which the puppet agent should connect\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: puppet
@@ -1352,14 +1503,6 @@ Where the CA stores signed certificates\.
 .
 .IP "" 0
 .
-.SS "smtpserver"
-The server through which to send email reports\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: none
-.
-.IP "" 0
-.
 .SS "splay"
 Whether to sleep for a pseudo\-random (but consistent) amount of time before a run\.
 .
@@ -1369,7 +1512,7 @@ Whether to sleep for a pseudo\-random (but consistent) amount of time before a r
 .IP "" 0
 .
 .SS "splaylimit"
-The maximum time to delay before runs\. Defaults to being the same as the run interval\. Can be specified as a duration\.
+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)\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: $runinterval
@@ -1380,19 +1523,22 @@ The maximum time to delay before runs\. Defaults to being the same as the run in
 The domain which will be queried to find the SRV records of servers to use\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: puppetlabs\.lan
+\fIDefault\fR: corp\.puppetlabs\.net
 .
 .IP "" 0
 .
 .SS "ssl_client_ca_auth"
-Certificate authorities who issue server certificates\. SSL servers will not be considered authentic unless they posses a certificate issued by an authority listed in this file\. If this setting has no value then the Puppet master\'s CA certificate (localcacert) will be used\.
+Certificate authorities who issue server certificates\. SSL servers will not be considered authentic unless they possess a certificate issued by an authority listed in this file\. If this setting has no value then the Puppet master\'s CA certificate (localcacert) will be used\.
 .
 .TP
 \fIDefault\fR:
 
 .
 .SS "ssl_client_header"
-The header containing an authenticated client\'s SSL DN\. This header must be set by the proxy to the authenticated client\'s SSL DN (e\.g\., \fB/CN=puppet\.puppetlabs\.com\fR)\.
+The header containing an authenticated client\'s SSL DN\. This header must be set by the proxy to the authenticated client\'s SSL DN (e\.g\., \fB/CN=puppet\.puppetlabs\.com\fR)\. Puppet will parse out the Common Name (CN) from the Distinguished Name (DN) and use the value of the CN field for authorization\.
+.
+.P
+Note that the name of the HTTP header gets munged by the web server common gateway inteface: an \fBHTTP_\fR prefix is added, dashes are converted to underscores, and all letters are uppercased\. Thus, to use the \fBX\-Client\-DN\fR header, this setting should be \fBHTTP_X_CLIENT_DN\fR\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: HTTP_X_CLIENT_DN
@@ -1402,13 +1548,16 @@ The header containing an authenticated client\'s SSL DN\. This header must be se
 .SS "ssl_client_verify_header"
 The header containing the status message of the client verification\. This header must be set by the proxy to \'SUCCESS\' if the client successfully authenticated, and anything else otherwise\.
 .
+.P
+Note that the name of the HTTP header gets munged by the web server common gateway inteface: an \fBHTTP_\fR prefix is added, dashes are converted to underscores, and all letters are uppercased\. Thus, to use the \fBX\-Client\-Verify\fR header, this setting should be \fBHTTP_X_CLIENT_VERIFY\fR\.
+.
 .IP "\(bu" 4
 \fIDefault\fR: HTTP_X_CLIENT_VERIFY
 .
 .IP "" 0
 .
 .SS "ssl_server_ca_auth"
-Certificate authorities who issue client certificates\. SSL clients will not be considered authentic unless they posses a certificate issued by an authority listed in this file\. If this setting has no value then the Puppet master\'s CA certificate (localcacert) will be used\.
+Certificate authorities who issue client certificates\. SSL clients will not be considered authentic unless they possess a certificate issued by an authority listed in this file\. If this setting has no value then the Puppet master\'s CA certificate (localcacert) will be used\.
 .
 .TP
 \fIDefault\fR:
@@ -1439,7 +1588,13 @@ Where puppet agent and puppet master store state associated with the running con
 .IP "" 0
 .
 .SS "storeconfigs"
-Whether to store each client\'s configuration, including catalogs, facts, and related data\. This also enables the import and export of resources in the Puppet language \- a mechanism for exchange resources between nodes\. By default this uses ActiveRecord and an SQL database to store and query the data; this, in turn, will depend on Rails being available\. You can adjust the backend using the storeconfigs_backend setting\.
+Whether to store each client\'s configuration, including catalogs, facts, and related data\. This also enables the import and export of resources in the Puppet language \- a mechanism for exchange resources between nodes\.
+.
+.P
+By default this uses the \'puppetdb\' backend\.
+.
+.P
+You can adjust the backend using the storeconfigs_backend setting\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
@@ -1447,10 +1602,10 @@ Whether to store each client\'s configuration, including catalogs, facts, and re
 .IP "" 0
 .
 .SS "storeconfigs_backend"
-Configure the backend terminus used for StoreConfigs\. By default, this uses the ActiveRecord store, which directly talks to the database from within the Puppet Master process\.
+Configure the backend terminus used for StoreConfigs\. By default, this uses the PuppetDB store, which must be installed and configured before turning on StoreConfigs\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: active_record
+\fIDefault\fR: puppetdb
 .
 .IP "" 0
 .
@@ -1462,54 +1617,46 @@ Whether to only search for the complete hostname as it is in the certificate whe
 .
 .IP "" 0
 .
-.SS "summarize"
-Whether to print a transaction summary\.
+.SS "strict_variables"
+Makes the parser raise errors when referencing unknown variables\. (This does not affect referencing variables that are explicitly set to undef)\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
-.SS "syslogfacility"
-What syslog facility to use when logging to syslog\. Syslog has a fixed list of valid facilities, and you must choose one of those; you cannot just make one up\.
+.SS "summarize"
+Whether to print a transaction summary\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: daemon
+\fIDefault\fR: false
 .
 .IP "" 0
 .
-.SS "tagmap"
-The mapping between reporting tags and email addresses\.
+.SS "syslogfacility"
+What syslog facility to use when logging to syslog\. Syslog has a fixed list of valid facilities, and you must choose one of those; you cannot just make one up\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: $confdir/tagmail\.conf
+\fIDefault\fR: daemon
 .
 .IP "" 0
 .
 .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 "templatedir"
-Where Puppet looks for template files\. Can be a list of colon\-separated directories\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: $vardir/templates
-.
-.IP "" 0
-.
-.SS "thin_storeconfigs"
-Boolean; whether Puppet should store only facts and exported resources in the storeconfigs database\. This will improve the performance of exported resources with the older \fBactive_record\fR backend, but will disable external tools that search the storeconfigs database\. Thinning catalogs is generally unnecessary when using PuppetDB to store catalogs\.
+.SS "trace"
+Whether to print stack traces on some errors
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
 .
 .IP "" 0
 .
-.SS "trace"
-Whether to print stack traces on some errors
+.SS "trusted_oid_mapping_file"
+File that provides mapping between custom SSL oids and user\-friendly names
 .
 .IP "\(bu" 4
-\fIDefault\fR: false
+\fIDefault\fR: $confdir/custom_trusted_oid_mapping\.yaml
 .
 .IP "" 0
 .
@@ -1549,12 +1696,18 @@ The user puppet master should run as\.
 Where Puppet stores dynamic and growing data\. The default for this setting is calculated specially, like \fBconfdir\fR_\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: /var/lib/puppet
+\fIDefault\fR: /opt/puppetlabs/puppet/cache
 .
 .IP "" 0
 .
 .SS "waitforcert"
-The time interval \'puppet agent\' should connect to the server and ask it to sign a certificate request\. This is useful for the initial setup of a puppet client\. You can turn off waiting for certificates by specifying a time of 0\. Can be specified as a duration\.
+How frequently puppet agent should ask for a signed certificate\.
+.
+.P
+When starting for the first time, puppet agent will submit a certificate signing request (CSR) to the server named in the \fBca_server\fR setting (usually the puppet master); this may be autosigned, or may need to be approved by a human, depending on the CA server\'s configuration\.
+.
+.P
+Puppet agent cannot apply configurations until its approved certificate is available\. Since the certificate may or may not be available immediately, puppet agent will repeatedly try to fetch it at this interval\. You can turn off waiting for certificates by specifying a time of 0, in which case puppet agent will exit if it cannot get a cert\. 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: 2m
@@ -1569,13 +1722,5 @@ The directory in which YAML data is stored, usually in a subdirectory\.
 .
 .IP "" 0
 .
-.SS "zlib"
-Boolean; whether to use the zlib library
-.
-.IP "\(bu" 4
-\fIDefault\fR: true
-.
-.IP "" 0
-.
 .P
-\fIThis page autogenerated on Tue Jan 15 12:33:09 \-0800 2013\fR
+\fIThis page autogenerated on 2015\-02\-27 14:27:32 \-0800\fR