diff options
| author | nfagerlund <nick.fagerlund@gmail.com> | 2011-05-27 16:17:17 -0700 |
|---|---|---|
| committer | nfagerlund <nick.fagerlund@gmail.com> | 2011-05-27 16:17:17 -0700 |
| commit | 0d9eaea6fafe6bf57731a115d6a41c7ceacd8057 (patch) | |
| tree | 00de34e863c8364ec56243bd30b6bf6580e94945 /lib/puppet/application | |
| parent | 3facc3393378ef7848374621a4674c977e82f884 (diff) | |
| parent | 7df1fa448c9eb5f23f8ea481bbea18e09f8fff29 (diff) | |
| download | puppet-0d9eaea6fafe6bf57731a115d6a41c7ceacd8057.tar.gz puppet-0d9eaea6fafe6bf57731a115d6a41c7ceacd8057.tar.xz puppet-0d9eaea6fafe6bf57731a115d6a41c7ceacd8057.zip | |
Merge branch 'ticket/2.7rc/7708-reorganize-config-refs' into 2.7rc
Diffstat (limited to 'lib/puppet/application')
| -rw-r--r-- | lib/puppet/application/agent.rb | 12 | ||||
| -rw-r--r-- | lib/puppet/application/master.rb | 10 |
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 ------ |