summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authornfagerlund <nick.fagerlund@gmail.com>2011-04-18 16:51:56 -0700
committernfagerlund <nick.fagerlund@gmail.com>2011-04-18 16:51:56 -0700
commit125131121a88c972d27f6e45ffd21aa0369e2df9 (patch)
treebb9635c91f2b0e99ad2f004d28a10dd7cc669eb9 /lib
parenteeb1b60dceda1af79ed40662d8cc52299e75157f (diff)
downloadpuppet-125131121a88c972d27f6e45ffd21aa0369e2df9.tar.gz
puppet-125131121a88c972d27f6e45ffd21aa0369e2df9.tar.xz
puppet-125131121a88c972d27f6e45ffd21aa0369e2df9.zip
(#7108) Update help/man text for puppet kick
Puppet kick's help referred only to the outdated authconfig (namespaceauth.conf) file, rather than the modern rest_authconfig (auth.conf).
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/application/kick.rb35
1 files changed, 10 insertions, 25 deletions
diff --git a/lib/puppet/application/kick.rb b/lib/puppet/application/kick.rb
index 536699442..4f3ed1802 100644
--- a/lib/puppet/application/kick.rb
+++ b/lib/puppet/application/kick.rb
@@ -76,31 +76,16 @@ copy things like LDAP settings.
USAGE NOTES
-----------
-'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 '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 access to
-each namespace; if you create the file you must add every namespace you
-want any Puppet daemon to allow -- it is currently global to all Puppet
-daemons.
-
-An example file looks like this:
-
- [fileserver]
- allow *.madstop.com
-
- [puppetmaster]
- allow *.madstop.com
-
- [puppetrunner]
- allow culain.madstop.com
-
-This is what you would install on your Puppet master; non-master hosts
-could leave off the 'fileserver' and 'puppetmaster' namespaces.
-
+Puppet kick is useless unless puppet agent is listening for incoming
+connections and allowing access to the `run` endpoint. This entails
+starting the agent with `listen = true` in its puppet.conf file, and
+allowing access to the `/run` path in its auth.conf file; see
+`http://docs.puppetlabs.com/guides/rest_auth_conf.html` for more
+details.
+
+Additionally, due to a known bug, you must make sure a
+namespaceauth.conf file exists in puppet agent's $confdir. This file
+will not be consulted, and may be left empty.
OPTIONS
-------