summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authornfagerlund <nick.fagerlund@gmail.com>2011-04-18 16:06:31 -0700
committernfagerlund <nick.fagerlund@gmail.com>2011-04-18 16:06:31 -0700
commiteeb1b60dceda1af79ed40662d8cc52299e75157f (patch)
tree7cfd696d0055c56bd5cb3700d6114d5a7029c536 /lib/puppet
parent3ec9526b84bbee760e7040fde439c577727ca915 (diff)
downloadpuppet-eeb1b60dceda1af79ed40662d8cc52299e75157f.tar.gz
puppet-eeb1b60dceda1af79ed40662d8cc52299e75157f.tar.xz
puppet-eeb1b60dceda1af79ed40662d8cc52299e75157f.zip
(#7108) Modernize description of --listen in defaults.rb
--listen's description referred to the older XMLRPC authorization path.
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/defaults.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 84289768e..139c3c763 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -528,10 +528,10 @@ module Puppet
:runinterval => [1800, # 30 minutes
"How often puppet agent applies the client configuration; in seconds."],
:listen => [false, "Whether puppet agent should listen for
- connections. If this is true, then by default only the
- `runner` server is started, which allows remote authorized
- and authenticated nodes to connect and trigger `puppet agent`
- runs."],
+ 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 `rest_authconfig` file. Puppet agent can respond usefully to
+ requests on the `run`, `facts`, `certificate`, and `resource` endpoints."],
:ca_server => ["$server", "The server to use for certificate
authority requests. It's a separate server because it cannot
and does not need to horizontally scale."],