diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-06-08 18:41:16 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-06-08 18:41:16 -0700 |
| commit | 8ccd00963d91f168438eaec4b29a18cd4a1ac583 (patch) | |
| tree | 85e15c5ef9390454438fb300c5baa38a7f2f5f3e /man/man8/puppet-master.8 | |
| parent | 376e0f04af01810d00eede4de52744bb8c8e1681 (diff) | |
| parent | d4c499dfdbd94f5272278e1ba87a75915607c3d7 (diff) | |
| download | puppet-8ccd00963d91f168438eaec4b29a18cd4a1ac583.tar.gz puppet-8ccd00963d91f168438eaec4b29a18cd4a1ac583.tar.xz puppet-8ccd00963d91f168438eaec4b29a18cd4a1ac583.zip | |
Merge branch '2.7rc' into 2.7.x
Diffstat (limited to 'man/man8/puppet-master.8')
| -rw-r--r-- | man/man8/puppet-master.8 | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/man/man8/puppet-master.8 b/man/man8/puppet-master.8 index 9ed2a6ad6..c38d34afa 100644 --- a/man/man8/puppet-master.8 +++ b/man/man8/puppet-master.8 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "PUPPET\-MASTER" "8" "February 2011" "Puppet Labs, LLC" "Puppet manual" +.TH "PUPPET\-MASTER" "8" "June 2011" "Puppet Labs, LLC" "Puppet manual" . .SH "NAME" \fBpuppet\-master\fR \- The puppet master daemon @@ -56,8 +56,19 @@ Compile a catalogue and output it in JSON from the puppet master\. Uses facts co .SH "EXAMPLE" puppet master . +.SH "DIAGNOSTICS" +When running as a standalone daemon, puppet master accepts the following signals: +. +.TP +SIGHUP +Restart the puppet master server\. +. +.TP +SIGINT and SIGTERM +Shut down the puppet master server\. +. .SH "AUTHOR" Luke Kanies . .SH "COPYRIGHT" -Copyright (c) 2005 Puppet Labs, LLC Licensed under the GNU Public License +Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2\.0 License |