summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornfagerlund <nick.fagerlund@gmail.com>2011-05-27 16:00:17 -0700
committernfagerlund <nick.fagerlund@gmail.com>2011-05-27 16:06:23 -0700
commit2935feb648f7945175ebd11a243155ab088a8efe (patch)
tree896d509b76bcfd153ec2a6c573ce898444d43e0d
parent3facc3393378ef7848374621a4674c977e82f884 (diff)
downloadpuppet-2935feb648f7945175ebd11a243155ab088a8efe.tar.gz
puppet-2935feb648f7945175ebd11a243155ab088a8efe.tar.xz
puppet-2935feb648f7945175ebd11a243155ab088a8efe.zip
(#7707) Document signals in puppet agent and puppet master help
Previously, the signals accepted by the agent and master daemons were only documented in the configuration reference, which didn't make any particular sense. This commit moves their documentation to a blurb in the relevant man pages. This is a doc string only commit.
-rw-r--r--lib/puppet/application/agent.rb12
-rw-r--r--lib/puppet/application/master.rb10
2 files changed, 22 insertions, 0 deletions
diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb
index fc8616817..e8f2f1bc5 100644
--- a/lib/puppet/application/agent.rb
+++ b/lib/puppet/application/agent.rb
@@ -281,6 +281,18 @@ EXAMPLE
$ puppet agent --server puppet.domain.com
+DIAGNOSTICS
+-----------
+
+Puppet agent accepts the following signals:
+
+* SIGHUP:
+ Restart the puppet agent daemon.
+* SIGINT and SIGTERM:
+ Shut down the puppet agent daemon.
+* SIGUSR1:
+ Immediately retrieve and apply configurations from the puppet master.
+
AUTHOR
------
Luke Kanies
diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb
index a90829ae0..18425c8bc 100644
--- a/lib/puppet/application/master.rb
+++ b/lib/puppet/application/master.rb
@@ -102,6 +102,16 @@ EXAMPLE
-------
puppet master
+DIAGNOSTICS
+-----------
+
+When running as a standalone daemon, puppet master accepts the
+following signals:
+
+* SIGHUP:
+ Restart the puppet master server.
+* SIGINT and SIGTERM:
+ Shut down the puppet master server.
AUTHOR
------