puppet 2.7.26 → 3.0.0.rc4

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 #
 module Puppet
-  PUPPETVERSION = '2.7.26'
+  PUPPETVERSION = '3.0.0-rc4'
 
   def self.version
     @puppet_version || PUPPETVERSION

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" "June 2012" "Puppet Labs, LLC" "Puppet manual"
-\fBThis page is autogenerated; any changes will get overwritten\fR \fI(last generated on Wed Jun 06 13:43:46 \-0700 2012)\fR
+.TH "PUPPETCONF" "5" "May 2012" "Puppet Labs, LLC" "Puppet manual"
+\fBThis page is autogenerated; any changes will get overwritten\fR \fI(last generated on Thu May 17 14:19:16 \-0700 2012)\fR
 .
 .SH "Configuration Settings"
 .
@@ -29,6 +29,22 @@ The Puppet executables will ignore any setting that isn\'t relevant to their fun
 .P
 See the configuration guide \fIhttp://docs\.puppetlabs\.com/guides/configuring\.html\fR for more details\.
 .
+.SS "agent_disabled_lockfile"
+A lock file to indicate that puppet agent runs have been administratively disabled\. File contains a JSON object with state information\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: $statedir/agent_disabled\.lock
+.
+.IP "" 0
+.
+.SS "agent_pidfile"
+A lock file to indicate that a puppet agent run is currently in progress\. File contains the pid of the running process\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: $statedir/agent\.pid
+.
+.IP "" 0
+.
 .SS "allow_duplicate_certs"
 Whether to allow a new certificate request to overwrite an existing certificate\.
 .
@@ -54,7 +70,7 @@ 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 \fBpuppetqd\fR be running and that \'PSON\' support for ruby be installed\.
+Whether to use a queueing system to provide asynchronous database integration\. Requires that \fBpuppet queue\fR be running and that \'PSON\' support for ruby be installed\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
@@ -97,7 +113,7 @@ Where FileBucket files are stored\.
 .IP "" 0
 .
 .SS "ca"
-Wether the master should function as a certificate authority\.
+Whether the master should function as a certificate authority\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: true
@@ -285,7 +301,7 @@ The directory in which client\-side YAML data is stored\.
 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 "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\.
+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\.
 .
 .IP "\(bu" 4
 \fIDefault\fR: ansi
@@ -301,10 +317,18 @@ The main Puppet configuration directory\. The default for this setting is calcul
 .IP "" 0
 .
 .SS "config"
-The configuration file for doc\.
+The configuration file for the current puppet application
+.
+.IP "\(bu" 4
+\fIDefault\fR: $confdir/${config_file_name}
+.
+.IP "" 0
+.
+.SS "config_file_name"
+The name of the puppet config file\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: $confdir/puppet\.conf
+\fIDefault\fR: puppet\.conf
 .
 .IP "" 0
 .
@@ -346,6 +370,14 @@ Whether to send the process into the background\. This defaults to true on POSIX
 .
 .IP "" 0
 .
+.SS "data_binding_terminus"
+Where to retrive information about data\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: hiera
+.
+.IP "" 0
+.
 .SS "dbadapter"
 The type of database to use\.
 .
@@ -411,6 +443,14 @@ The database user for caching\. Only used when networked databases are used\.
 .
 .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\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: rest
+.
+.IP "" 0
+.
 .SS "deviceconfig"
 Path to the device config file for puppet device
 .
@@ -494,14 +534,6 @@ An external command that can produce node information\. The command\'s output mu
 .
 .IP "" 0
 .
-.SS "factdest"
-Where Puppet should store facts that it pulls down from the central server\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: $vardir/facts/
-.
-.IP "" 0
-.
 .SS "factpath"
 Where Puppet should look for facts\. Multiple directories should be separated by the system path separator character\. (The POSIX path separator is \':\', and the Windows path separator is \';\'\.)
 .
@@ -518,30 +550,6 @@ The node facts terminus\.
 .
 .IP "" 0
 .
-.SS "factsignore"
-What files to ignore when pulling down facts\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: \.svn CVS
-.
-.IP "" 0
-.
-.SS "factsource"
-From where to retrieve facts\. 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/facts/
-.
-.IP "" 0
-.
-.SS "factsync"
-Whether facts should be synced with the central server\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: false
-.
-.IP "" 0
-.
 .SS "fileserverconfig"
 Where the fileserver configuration is stored\.
 .
@@ -606,6 +614,14 @@ The group puppet master should run as\.
 .
 .IP "" 0
 .
+.SS "hiera_config"
+The hiera configuration file
+.
+.IP "\(bu" 4
+\fIDefault\fR: $confdir/hiera\.yaml
+.
+.IP "" 0
+.
 .SS "hostcert"
 Where individual hosts store and look for their certificates\.
 .
@@ -880,12 +896,11 @@ Where puppet agent caches the local configuration\. An extension indicating the
 .IP "" 0
 .
 .SS "logdir"
-The Puppet log directory\.
+The directory in which to store log files
 .
-.IP "\(bu" 4
-\fIDefault\fR: $vardir/log
-.
-.IP "" 0
+.TP
+\fIDefault\fR:
+
 .
 .SS "manage_internal_file_permissions"
 Whether Puppet should manage the owner, group, and mode of files it uses internally
@@ -978,10 +993,9 @@ The search path for modules, as a list of directories separated by the system pa
 .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\.
 .
-.IP "\(bu" 4
-\fIDefault\fR: doc
-.
-.IP "" 0
+.TP
+\fIDefault\fR:
+
 .
 .SS "node_name"
 How the puppet master determines the client\'s identity and sets the \'hostname\', \'fqdn\' and \'domain\' facts for use in the manifest, in particular for determining which \'node\' statement applies to the client\. Possible values are \'cert\' (use the subject\'s CN in the client\'s certificate) and \'facter\' (use the hostname that the client reported in its facts)
@@ -1046,7 +1060,7 @@ The shell search path\. Defaults to whatever is inherited from the parent proces
 The pid file
 .
 .IP "\(bu" 4
-\fIDefault\fR: $rundir/$name\.pid
+\fIDefault\fR: $rundir/${run_mode}\.pid
 .
 .IP "" 0
 .
@@ -1078,7 +1092,7 @@ From where to retrieve plugins\. The standard Puppet \fBfile\fR type is used for
 Whether plugins should be synced with the central server\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: false
+\fIDefault\fR: true
 .
 .IP "" 0
 .
@@ -1120,14 +1134,6 @@ The public key directory\.
 .
 .IP "" 0
 .
-.SS "puppetdlockfile"
-A lock file to temporarily stop puppet agent from doing anything\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: $statedir/puppetdlock
-.
-.IP "" 0
-.
 .SS "puppetdlog"
 The log file for puppet agent\. This is generally not used\.
 .
@@ -1299,18 +1305,16 @@ How often RRD should expect data\. This should match how often the hosts report
 .SS "run_mode"
 The effective \'run mode\' of the application: master, agent, or user\.
 .
-.IP "\(bu" 4
-\fIDefault\fR: master
-.
-.IP "" 0
+.TP
+\fIDefault\fR:
+
 .
 .SS "rundir"
 Where Puppet PID files are kept\.
 .
-.IP "\(bu" 4
-\fIDefault\fR: $vardir/run
-.
-.IP "" 0
+.TP
+\fIDefault\fR:
+
 .
 .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\.
@@ -1337,7 +1341,7 @@ Where the serial number for certificates is stored\.
 .IP "" 0
 .
 .SS "server"
-The server to which server puppet agent should connect
+The server to which the puppet agent should connect
 .
 .IP "\(bu" 4
 \fIDefault\fR: puppet
@@ -1400,6 +1404,14 @@ The maximum time to delay before runs\. Defaults to being the same as the run in
 .
 .IP "" 0
 .
+.SS "srv_domain"
+The domain which will be queried to find the SRV records of servers to use\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: puppetlabs\.lan
+.
+.IP "" 0
+.
 .SS "ssl_client_header"
 The header containing an authenticated client\'s SSL DN\. Only used with Mongrel\. This header must be set by the proxy to the authenticated client\'s SSL DN (e\.g\., \fB/CN=puppet\.puppetlabs\.com\fR)\. See http://projects\.puppetlabs\.com/projects/puppet/wiki/Using_Mongrel for more information\.
 .
@@ -1500,7 +1512,7 @@ Where Puppet looks for template files\. Can be a list of colon\-separated direct
 .IP "" 0
 .
 .SS "thin_storeconfigs"
-Boolean; wether storeconfigs store in the database only the facts and exported resources\. If true, then storeconfigs performance will be higher and still allow exported/collected resources, but other usage external to Puppet might not work
+Boolean; whether storeconfigs store in the database only the facts and exported resources\. If true, then storeconfigs performance will be higher and still allow exported/collected resources, but other usage external to Puppet might not work
 .
 .IP "\(bu" 4
 \fIDefault\fR: false
@@ -1523,6 +1535,14 @@ Whether to only use the cached catalog rather than compiling a new catalog on ev
 .
 .IP "" 0
 .
+.SS "use_srv_records"
+Whether the server will search for SRV records in DNS for the current domain\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: false
+.
+.IP "" 0
+.
 .SS "usecacheonfailure"
 Whether to use the cached configuration when the remote configuration will not compile\. This option is useful for testing new configurations, where you want to fix the broken configuration rather than reverting to a known\-good one\.
 .
@@ -1547,6 +1567,14 @@ Where Puppet stores dynamic and growing data\. The default for this setting is c
 .
 .IP "" 0
 .
+.SS "waitforcert"
+The time interval, specified in seconds, \'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\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: 120
+.
+.IP "" 0
+.
 .SS "yamldir"
 The directory in which YAML data is stored, usually in a subdirectory\.
 .
@@ -1564,4 +1592,4 @@ Boolean; whether to use the zlib library
 .IP "" 0
 .
 .P
-\fIThis page autogenerated on Wed Jun 06 13:43:46 \-0700 2012\fR
+\fIThis page autogenerated on Thu May 17 14:19:16 \-0700 2012\fR

data/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 2012" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-AGENT" "8" "May 2012" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-agent\fR \- The puppet agent daemon
@@ -13,7 +13,7 @@ Retrieves the client configuration from the puppet master and applies it to the
 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] [\-\-enable] [\-\-fingerprint] [\-h|\-\-help] [\-l|\-\-logdest syslog|\fIfile\fR|console] [\-\-no\-client] [\-\-noop] [\-o|\-\-onetime] [\-\-serve \fIhandler\fR] [\-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|\fIfile\fR|console] [\-\-no\-client] [\-\-noop] [\-o|\-\-onetime] [\-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\.
@@ -68,6 +68,9 @@ Change the certificate fingerprinting digest algorithm\. The default is MD5\. Va
 Disable working on the local system\. This puts a lock file in place, causing \'puppet agent\' not to work on the system until the lock file is removed\. This is useful if you are testing a configuration and do not want the central configuration to override the local state until everything is tested and committed\.
 .
 .IP
+Disable can also take an optional message that will be reported by the \'puppet agent\' at the next disabled run\.
+.
+.IP
 \'puppet agent\' uses the same lock file while it is running, so no more than one \'puppet agent\' process is working at a time\.
 .
 .IP
@@ -105,10 +108,6 @@ Use \'noop\' mode where the daemon runs in a no\-op or dry\-run mode\. This is u
 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\.
 .
 .TP
-\-\-serve
-Start another type of server\. By default, \'puppet agent\' will start a service handler that allows authenticated and authorized remote nodes to trigger the configuration to be pulled down and applied\. You can specify any handler here that does not require configuration, e\.g\., filebucket, ca, or resource\. The handlers are in \'lib/puppet/network/handler\', and the names must match exactly, both in the call to \'serve\' and in \'namespaceauth\.conf\'\.
-.
-.TP
 \-\-test
 Enable the most common options used for testing\. These are \'onetime\', \'verbose\', \'ignorecache\', \'no\-daemonize\', \'no\-usecacheonfailure\', \'detailed\-exit\-codes\', \'no\-splay\', and \'show_diff\'\.
 .

data/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 2012" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-APPLY" "8" "May 2012" "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|\-\-logdest \fIfile\fR] [\-\-apply \fIcatalog\fR] [\-\-catalog \fIcatalog\fR] \fIfile\fR
+puppet apply [\-h|\-\-help] [\-V|\-\-version] [\-d|\-\-debug] [\-v|\-\-verbose] [\-e|\-\-execute] [\-\-detailed\-exitcodes] [\-l|\-\-logdest \fIfile\fR] [\-\-noop] [\-\-apply \fIcatalog\fR] [\-\-catalog \fIcatalog\fR] \fIfile\fR
 .
 .SH "DESCRIPTION"
 This is the standalone puppet execution tool; use it to apply individual manifests\.
@@ -22,7 +22,7 @@ When provided with a modulepath, via command line or config file, puppet apply c
 Most users should use \'puppet agent\' and \'puppet master\' for site\-wide manifests\.
 .
 .SH "OPTIONS"
-Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'modulepath\' is a valid configuration parameter, so you can specify \'\-\-tags \fIclass\fR,\fItag\fR\' as an argument\.
+Note that any configuration parameter that\'s valid in the configuration file is also a valid long argument\. For example, \'tags\' is a valid configuration parameter, so you can specify \'\-\-tags \fIclass\fR,\fItag\fR\' as an argument\.
 .
 .P
 See the configuration file documentation at http://docs\.puppetlabs\.com/references/stable/configuration\.html for the full list of acceptable parameters\. A commented list of all configuration options can also be generated by running puppet with \'\-\-genconfig\'\.
@@ -48,6 +48,10 @@ Load any stored classes\. \'puppet agent\' caches configured classes (usually at
 Where to send messages\. Choose between syslog, the console, and a log file\. Defaults to sending messages to the console\.
 .
 .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\.
+.
+.TP
 \-\-execute
 Execute a specific piece of Puppet code
 .

data/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 2012" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET\-CA" "8" "May 2012" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-ca\fR \- Local Puppet Certificate Authority management\.
@@ -66,10 +66,7 @@ puppet ca fingerprint [\-\-digest ALGORITHM]
 Undocumented action\.
 .
 .IP
-\fBOPTIONS\fR
-.
-.IP
-\fI\-\-digest ALGORITHM\fR \- The hash algorithm to use when displaying the fingerprint
+\fBOPTIONS\fR \fI\-\-digest ALGORITHM\fR \- The hash algorithm to use when displaying the fingerprint
 .
 .TP
 \fBgenerate\fR \-
@@ -85,10 +82,7 @@ puppet ca generate [\-\-dns\-alt\-names NAMES]
 Undocumented action\.
 .
 .IP
-\fBOPTIONS\fR
-.
-.IP
-\fI\-\-dns\-alt\-names NAMES\fR \- 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\.
+\fBOPTIONS\fR \fI\-\-dns\-alt\-names NAMES\fR \- 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\.
 .
 .TP
 \fBlist\fR \- List certificates and/or certificate requests\.
@@ -104,10 +98,7 @@ puppet ca list [\-\-[no\-]all] [\-\-[no\-]pending] [\-\-[no\-]signed] [\-\-subje
 This will list the current certificates and certificate signing requests in the Puppet CA\. You will also get the fingerprint, and any certificate verification failure reported\.
 .
 .IP
-\fBOPTIONS\fR
-.
-.IP
-\fI\-\-[no\-]all\fR \- Include all certificates and requests\.
+\fBOPTIONS\fR \fI\-\-[no\-]all\fR \- Include all certificates and requests\.
 .
 .IP
 \fI\-\-[no\-]pending\fR \- Include pending certificate signing requests\.
@@ -161,10 +152,7 @@ puppet ca sign [\-\-[no\-]allow\-dns\-alt\-names]
 Undocumented action\.
 .
 .IP
-\fBOPTIONS\fR
-.
-.IP
-\fI\-\-[no\-]allow\-dns\-alt\-names\fR \- Whether or not to accept DNS alt names in the certificate request
+\fBOPTIONS\fR \fI\-\-[no\-]allow\-dns\-alt\-names\fR \- Whether or not to accept DNS alt names in the certificate request
 .
 .TP
 \fBverify\fR \-