diff options
| author | James Turnbull <james@lovedthanlost.net> | 2011-02-14 06:08:50 +1100 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-02-14 11:37:03 -0800 |
| commit | 7ef2fbf1ac217ef78181ffb41a9a226c7bb2b40f (patch) | |
| tree | bb7fc59c7aeeb598c9bef1ea83b93e18a2f2e92d /lib/puppet/util/command_line/puppetd | |
| parent | 193016dd152ff17ba94867897656ddca41621b3e (diff) | |
| download | puppet-7ef2fbf1ac217ef78181ffb41a9a226c7bb2b40f.tar.gz puppet-7ef2fbf1ac217ef78181ffb41a9a226c7bb2b40f.tar.xz puppet-7ef2fbf1ac217ef78181ffb41a9a226c7bb2b40f.zip | |
Updated fix for #3646 - apply / compile documentation
Diffstat (limited to 'lib/puppet/util/command_line/puppetd')
| -rwxr-xr-x | lib/puppet/util/command_line/puppetd | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/puppet/util/command_line/puppetd b/lib/puppet/util/command_line/puppetd index 71b28429b..d7d94ce09 100755 --- a/lib/puppet/util/command_line/puppetd +++ b/lib/puppet/util/command_line/puppetd @@ -15,6 +15,7 @@ # [-o|--onetime] [--serve <handler>] [-t|--test] [--noop] # [--digest <digest>] [--fingerprint] [-V|--version] # [-v|--verbose] [-w|--waitforcert <seconds>] +# [--apply catalog] # # = Description # @@ -60,7 +61,7 @@ # before signing a certificate request on the master, the certificate request the # master received is the same as the one the client sent (to prevent against # man-in-the-middle attacks when signing certificates). -# +# # # = Options # @@ -133,8 +134,8 @@ # makes sense when used in conjunction with --listen. # # onetime:: -# Run the configuration once. Runs a single (normally daemonized) Puppet run. -# Useful for interactively running puppet agent when used in conjunction with +# 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:: @@ -172,6 +173,10 @@ # client. You can turn off waiting for certificates by specifying a time # of 0. # +# apply:: +# Capability to apply JSON catalog (such as one generated with --compile on the Puppet master). +# You can either specify a JSON catalog file or pipe in JSON from standard input. +# # = Example # # puppet agent --server puppet.domain.com |