diff options
| author | James Turnbull <james@lovedthanlost.net> | 2011-01-17 10:44:57 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2011-01-17 10:44:57 +1100 |
| commit | e58f5dc724c060d08e0ec4abdab6908442bcc0bc (patch) | |
| tree | c793f7b80f0931e0c5d7a8e85a617bf0748053fa | |
| parent | 76d1c2aefb32cc3688e3f7c0a5c8bbf713a123ed (diff) | |
| download | puppet-e58f5dc724c060d08e0ec4abdab6908442bcc0bc.tar.gz puppet-e58f5dc724c060d08e0ec4abdab6908442bcc0bc.tar.xz puppet-e58f5dc724c060d08e0ec4abdab6908442bcc0bc.zip | |
Fixed #5742 - Removed legacy fqdn option from documentation
Patch from: Nick Fagerlund
| -rwxr-xr-x | lib/puppet/util/command_line/puppetd | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/puppet/util/command_line/puppetd b/lib/puppet/util/command_line/puppetd index cb8589c5f..f26131f30 100755 --- a/lib/puppet/util/command_line/puppetd +++ b/lib/puppet/util/command_line/puppetd @@ -11,7 +11,7 @@ # # puppet agent [-D|--daemonize|--no-daemonize] [-d|--debug] # [--detailed-exitcodes] [--disable] [--enable] -# [-h|--help] [--fqdn <host name>] [-l|--logdest syslog|<file>|console] +# [-h|--help] [--certname <host name>] [-l|--logdest syslog|<file>|console] # [-o|--onetime] [--serve <handler>] [-t|--test] [--noop] # [--digest <digest>] [--fingerprint] [-V|--version] # [-v|--verbose] [-w|--waitforcert <seconds>] @@ -113,10 +113,11 @@ # # +puppet agent+ exits after executing this. # -# fqdn:: -# Set the fully-qualified domain name of the client. This is only used for -# certificate purposes, but can be used to override the discovered hostname. -# If you need to use this flag, it is generally an indication of a setup problem. +# certname:: +# Set the certname (unique ID) of the client. The master reads this unique +# identifying string, which is usually set to the node's fully-qualified domain +# name, to determine which configurations the node will receive. Use this option +# to debug setup problems or implement unusual node identification schemes. # # help:: # Print this help message |