diff options
| -rwxr-xr-x | bin/filebucket | 8 | ||||
| -rwxr-xr-x | bin/pi | 8 | ||||
| -rwxr-xr-x | bin/puppetdoc | 16 | ||||
| -rwxr-xr-x | bin/ralsh | 17 | ||||
| -rwxr-xr-x | sbin/puppetca | 12 | ||||
| -rwxr-xr-x | sbin/puppetd | 34 | ||||
| -rwxr-xr-x | sbin/puppetmasterd | 4 | ||||
| -rwxr-xr-x | sbin/puppetqd | 4 | ||||
| -rwxr-xr-x | sbin/puppetrun | 20 |
9 files changed, 62 insertions, 61 deletions
diff --git a/bin/filebucket b/bin/filebucket index 1c5daa4e3..aa0a1d9d0 100755 --- a/bin/filebucket +++ b/bin/filebucket @@ -7,7 +7,7 @@ # # = Usage # -# filebucket [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose] +# puppet filebucket [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose] # [-l|--local] [-r|--remote] # [-s|--server <server>] [-b|--bucket <directory>] <file> <file> ... # @@ -41,9 +41,9 @@ # # = Example # -# $ filebucket backup /etc/passwd +# $ puppet filebucket backup /etc/passwd # /etc/passwd: 429b225650b912a2ee067b0a4cf1e949 -# $ filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949 +# $ puppet filebucket restore /tmp/passwd 429b225650b912a2ee067b0a4cf1e949 # $ # # = Options @@ -83,7 +83,7 @@ # # = Example # -# filebucket -b /tmp/filebucket /my/file +# puppet filebucket -b /tmp/filebucket /my/file # # = Author # @@ -7,7 +7,7 @@ # help. # = Usage # -# pi [-h|--help] [-s|--short] [-p|--providers] [-l|--list] [-m|--meta] +# puppet describe [-h|--help] [-s|--short] [-p|--providers] [-l|--list] [-m|--meta] # # = Description # @@ -32,9 +32,9 @@ # # = Example # -# pi --list -# pi file --providers -# pi user -s -m +# puppet describe --list +# puppet describe file --providers +# puppet describe user -s -m # # = Author # diff --git a/bin/puppetdoc b/bin/puppetdoc index e17b014b3..849b5338b 100755 --- a/bin/puppetdoc +++ b/bin/puppetdoc @@ -8,8 +8,8 @@ # # = Usage # -# puppetdoc [-a|--all] [-h|--help] [-o|--outputdir <rdoc outputdir>] [-m|--mode <text|pdf|markdown|trac|rdoc>] -# [-r|--reference <[type]|configuration|..>] [manifest-file] +# puppet doc [-a|--all] [-h|--help] [-o|--outputdir <rdoc outputdir>] [-m|--mode <text|pdf|markdown|trac|rdoc>] +# [-r|--reference <[type]|configuration|..>] [manifest-file] # # = Description # @@ -22,7 +22,7 @@ # are in 'manifestdir' and 'modulepath' configuration directives. # The generated documentation directory is doc by default but can be changed with the 'outputdir' option. # -# If the command is started with 'manifest-file' command-line arguments, puppetdoc generate a single +# If the command is started with 'manifest-file' command-line arguments, puppet doc generate a single # manifest documentation that is output on stdout. # # = Options @@ -40,17 +40,17 @@ # Determine the output mode. Valid modes are 'text', 'trac', 'pdf', 'markdown' and 'rdoc'. The 'pdf' and 'markdown' modes create PDF or Markdown formatted files in the /tmp directory. Note that 'trac' mode only works on Reductive Labs servers. The default mode is 'text'. In 'rdoc' mode you must provide 'manifests-path' # # reference:: -# Build a particular reference. Get a list of references by running +puppetdoc --list+. +# Build a particular reference. Get a list of references by running +puppet doc --list+. # # = Example # -# $ puppetdoc -r type > /tmp/type_reference.rst +# $ puppet doc -r type > /tmp/type_reference.rst # or -# $ puppetdoc --outputdir /tmp/rdoc --mode rdoc /path/to/manifests +# $ puppet doc --outputdir /tmp/rdoc --mode rdoc /path/to/manifests # or -# $ puppetdoc /etc/puppet/manifests/site.pp +# $ puppet doc /etc/puppet/manifests/site.pp # or -# $ puppetdoc -m markdown -r configuration +# $ puppet doc -m markdown -r configuration # # = Author # @@ -7,8 +7,9 @@ # # = Usage # -# ralsh [-h|--help] [-d|--debug] [-v|--verbose] [-e|--edit] [-H|--host <host>] -# [-p|--param <param>] [-t|--types] type <name> +# puppet resource [-h|--help] [-d|--debug] [-v|--verbose] [-e|--edit] +# [-H|--host <host>] [-p|--param <param>] [-t|--types] +# type <name> # # = Description # @@ -16,12 +17,12 @@ # into Puppet code, along with some ability to use Puppet to affect the current # state. # -# By default, you must at least provide a type to list, which case ralsh +# By default, you must at least provide a type to list, which case puppet resource # will tell you everything it knows about all instances of that type. You can -# optionally specify an instance name, and ralsh will only describe that single +# optionally specify an instance name, and puppet resource will only describe that single # instance. # -# You can also add +--edit+ as an argument, and ralsh will write its output +# You can also add +--edit+ as an argument, and puppet resource will write its output # to a file, open that file in an editor, and then apply the file as a Puppet # transaction. You can easily use this to use Puppet to make simple changes to # a system. @@ -63,9 +64,9 @@ # # = Example # -# This example uses ``ralsh`` to return Puppet configuration for the user ``luke``:: +# This example uses ``puppet resource`` to return Puppet configuration for the user ``luke``:: # -# $ ralsh user luke +# $ puppet resource user luke # user { 'luke': # home => '/home/luke', # uid => '100', @@ -85,5 +86,5 @@ # Copyright (c) 2005-2007 Reductive Labs, LLC # Licensed under the GNU Public License -require 'puppet/application/ralsh' +require 'puppet/application/resource' Puppet::Application[:resource].run diff --git a/sbin/puppetca b/sbin/puppetca index ce2e315a7..15bc3c64f 100755 --- a/sbin/puppetca +++ b/sbin/puppetca @@ -8,7 +8,7 @@ # # = Usage # -# puppetca [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose] +# puppet cert [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose] # [-g|--generate] [-l|--list] [-s|--sign] [-r|--revoke] # [-p|--print] [-c|--clean] [--verify] [--digest DIGEST] # [--fingerprint] [host] @@ -29,7 +29,7 @@ # See the configuration file documentation at # http://reductivelabs.com/projects/puppet/reference/configref.html for # the full list of acceptable parameters. A commented list of all -# configuration options can also be generated by running puppetca with +# configuration options can also be generated by running puppet cert with # '--genconfig'. # # all:: @@ -42,9 +42,9 @@ # least md5, sha1, md2, sha256. # # clean:: -# Remove all files related to a host from puppetca's storage. This is +# Remove all files related to a host from puppet cert's storage. This is # useful when rebuilding hosts, since new certificate signing requests -# will only be honored if puppetca does not have a copy of a signed +# will only be honored if puppet cert does not have a copy of a signed # certificate for that host. The certificate of the host remains valid. # If '--all' is specified then all host certificates, both signed and # unsigned, will be removed. @@ -94,9 +94,9 @@ # # = Example # -# $ puppetca -l +# $ puppet cert -l # culain.madstop.com -# $ puppetca -s culain.madstop.com +# $ puppet cert -s culain.madstop.com # # = Author # diff --git a/sbin/puppetd b/sbin/puppetd index f88e0fefe..d54834ab7 100755 --- a/sbin/puppetd +++ b/sbin/puppetd @@ -1,14 +1,14 @@ #!/usr/bin/env ruby # == Synopsis # -# Retrieve the client configuration from the central puppet server and apply +# Retrieve the client configuration from the puppet master and apply # it to the local host. # # Currently must be run out periodically, using cron or something similar. # # = Usage # -# puppetd [-D|--daemonize|--no-daemonize] [-d|--debug] +# puppet agent [-D|--daemonize|--no-daemonize] [-d|--debug] # [--detailed-exitcodes] [--disable] [--enable] # [-h|--help] [--fqdn <host name>] [-l|--logdest syslog|<file>|console] # [-o|--onetime] [--serve <handler>] [-t|--test] [--noop] @@ -30,7 +30,7 @@ # # = Usage Notes # -# +puppetd+ does its best to find a compromise between interactive use and +# +puppet agent+ does its best to find a compromise between interactive use and # daemon use. Run with no arguments and no configuration, it will go into the # backgroun, attempt to get a signed certificate, and retrieve and apply its # configuration every 30 minutes. @@ -52,7 +52,7 @@ # which would only apply that small portion of the configuration during your # testing, rather than applying the whole thing. # -# +fingerprint+ is a one-time flag. In this mode +puppetd+ will run once and +# +fingerprint+ is a one-time flag. In this mode +puppet agent+ will run once and # display on the console (and in the log) the current certificate (or certificate # request) fingerprint. Providing the +--digest+ option allows to use a different # digest algorithm to generate the fingerprint. The main use is to verify that @@ -70,7 +70,7 @@ # See the configuration file documentation at # http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for # the full list of acceptable parameters. A commented list of all -# configuration options can also be generated by running puppetd with +# configuration options can also be generated by running puppet agent with # '--genconfig'. # # daemonize:: @@ -95,22 +95,22 @@ # # disable:: # Disable working on the local system. This puts a lock file in place, -# causing +puppetd+ not to work on the system until the lock file is removed. +# 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. # -# +puppetd+ uses the same lock file while it is running, so no more than one -# +puppetd+ process is working at a time. +# +puppet agent+ uses the same lock file while it is running, so no more than one +# +puppet agent+ process is working at a time. # -# +puppetd+ exits after executing this. +# +puppet agent+ exits after executing this. # # enable:: # Enable working on the local system. This removes any lock file, causing -# +puppetd+ to start managing the local system again (although it will continue +# +puppet agent+ to start managing the local system again (although it will continue # to use its normal scheduling, so it might not start for another half hour). # -# +puppetd+ exits after executing this. +# +puppet agent+ exits after executing this. # # fqdn:: # Set the fully-qualified domain name of the client. This is only used for @@ -131,16 +131,16 @@ # makes sense when used in conjunction with --listen. # # onetime:: -# Run the configuration once. Runs a single daemonized Puppet run. Useful for -# interactively running puppetd and hence used in conjunction with the --no-daemonize -# option. +# 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. # # fingerprint:: # Display the current certificate or certificate signing request fingerprint # and then exit. Use the +--digest+ option to change the digest algorithm used. # # serve:: -# Start another type of server. By default, +puppetd+ will start +# 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, @@ -164,14 +164,14 @@ # waitforcert:: # This option only matters for daemons that do not yet have certificates # and it is enabled by default, with a value of 120 (seconds). This causes -# +puppetd+ to connect to the server every 2 minutes and ask it to sign a +# +puppet agent+ to connect to the server every 2 minutes 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. # # = Example # -# puppetd --server puppet.domain.com +# puppet agent --server puppet.domain.com # # = Author # diff --git a/sbin/puppetmasterd b/sbin/puppetmasterd index 454703bc7..53b9242ab 100755 --- a/sbin/puppetmasterd +++ b/sbin/puppetmasterd @@ -7,7 +7,7 @@ # # = Usage # -# puppetmasterd [-D|--daemonize|--no-daemonize] [-d|--debug] [-h|--help] +# puppet master [-D|--daemonize|--no-daemonize] [-d|--debug] [-h|--help] # [-l|--logdest <file>|console|syslog] [-v|--verbose] [-V|--version] # # = Description @@ -51,7 +51,7 @@ # # = Example # -# puppetmasterd +# puppet master # # = Author # diff --git a/sbin/puppetqd b/sbin/puppetqd index 4cf8d4f02..56c82ca46 100755 --- a/sbin/puppetqd +++ b/sbin/puppetqd @@ -5,7 +5,7 @@ # # = Usage # -# puppetqd [-d|--debug] [-v|--verbose] +# puppet queue [-d|--debug] [-v|--verbose] # # = Description # @@ -38,7 +38,7 @@ # # = Example # -# puppetqd +# puppet queue # # = Author # diff --git a/sbin/puppetrun b/sbin/puppetrun index 641c1bb78..d2a1284c9 100755 --- a/sbin/puppetrun +++ b/sbin/puppetrun @@ -3,36 +3,36 @@ # # = Synopsis # -# Trigger a puppetd run on a set of hosts. +# Trigger a puppet agent run on a set of hosts. # # = Usage # -# puppetrun [-a|--all] [-c|--class <class>] [-d|--debug] [-f|--foreground] +# puppet kick [-a|--all] [-c|--class <class>] [-d|--debug] [-f|--foreground] # [-h|--help] [--host <host>] [--no-fqdn] [--ignoreschedules] # [-t|--tag <tag>] [--test] [-p|--ping] # # = Description # -# This script can be used to connect to a set of machines running +puppetd+ +# This script can be used to connect to a set of machines running +puppet agent+ # and trigger them to run their configurations. The most common usage would -# be to specify a class of hosts and a set of tags, and +puppetrun+ would +# be to specify a class of hosts and a set of tags, and +puppet kick+ would # look up in LDAP all of the hosts matching that class, then connect to # each host and trigger a run of all of the objects with the specified tags. # # If you are not storing your host configurations in LDAP, you can specify # hosts manually. # -# You will most likely have to run +puppetrun+ as root to get access to +# You will most likely have to run +puppet kick+ as root to get access to # the SSL certificates. # -# +puppetrun+ reads +puppetmaster+'s configuration file, so that it can copy +# +puppet kick+ reads +puppet master+'s configuration file, so that it can copy # things like LDAP settings. # # = Usage Notes # -# +puppetrun+ is useless unless +puppetd+ is listening. See its documentation +# +puppet kick+ is useless unless +puppet agent+ is listening. See its documentation # for more information, but the gist is that you must enable +listen+ on the -# +puppetd+ daemon, either using +--listen+ on the command line or adding +# +puppet agent+ daemon, either using +--listen+ on the command line or adding # 'listen: true' in its config file. In addition, you need to set the daemons # up to specifically allow connections by creating the +namespaceauth+ file, # normally at '/etc/puppet/namespaceauth.conf'. This file specifies who has @@ -65,7 +65,7 @@ # See the configuration file documentation at # http://reductivelabs.com/projects/puppet/reference/configref.html for # the full list of acceptable parameters. A commented list of all -# configuration options can also be generated by running puppetmasterdd with +# configuration options can also be generated by running puppet master with # '--genconfig'. # # @@ -114,7 +114,7 @@ # # = Example # -# sudo puppetrun -p 10 --host host1 --host host2 -t remotefile -t webserver +# sudo puppet kick -p 10 --host host1 --host host2 -t remotefile -t webserver # # = Author # |