diff options
| author | Luke Kanies <luke@madstop.com> | 2007-10-03 17:32:40 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-10-03 17:32:40 -0500 |
| commit | f8c8efeff6f08cf8c23075311ce14bfd4decedb0 (patch) | |
| tree | 4e0c39069fdff45f003b7e51783e6c0f579006b6 /lib/puppet/defaults.rb | |
| parent | 5d50ca790e7f752e07da84197b52ff84d2dcfdb4 (diff) | |
| parent | 1be1db91c2ff3103c900da9ba3a3ba533d2587e7 (diff) | |
| download | puppet-f8c8efeff6f08cf8c23075311ce14bfd4decedb0.tar.gz puppet-f8c8efeff6f08cf8c23075311ce14bfd4decedb0.tar.xz puppet-f8c8efeff6f08cf8c23075311ce14bfd4decedb0.zip | |
Merge branch 'master' of git://michaelobrien.info/puppet
Diffstat (limited to 'lib/puppet/defaults.rb')
| -rw-r--r-- | lib/puppet/defaults.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index f76ae9b84..6f44919e2 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -131,7 +131,11 @@ module Puppet :diff => ["diff", "Which diff command to use when printing differences between files."], :show_diff => [false, "Whether to print a contextual diff when files are being replaced. The diff is printed on stdout, so this option is meaningless unless you are running Puppet interactively. - This feature currently requires the ``diff/lcs`` Ruby library."] + This feature currently requires the ``diff/lcs`` Ruby library."], + :daemonize => { :default => true, + :desc => "Send the process into the background. This is the default.", + :short => "D" + } ) hostname = Facter["hostname"].value @@ -339,7 +343,7 @@ module Puppet :owner => "root", :mode => 0644, :desc => "The file in which puppetd stores a list of the classes - associated with the retrieved configuratiion. Can be loaded in + associated with the retrieved configuration. Can be loaded in the separate ``puppet`` executable using the ``--loadclasses`` option."}, :puppetdlog => { :default => "$logdir/puppetd.log", |