diff options
| author | Michael V. O'Brien <michael@reductivelabs.com> | 2007-10-03 17:06:06 -0500 |
|---|---|---|
| committer | Michael V. O'Brien <michael@reductivelabs.com> | 2007-10-03 17:06:06 -0500 |
| commit | 0b8893b3b8ffd391287a590b4f271edca70331da (patch) | |
| tree | d95e932676c7d06310d20e0248e5bc4be89fa91b /lib | |
| parent | ed8fa9b3458cacd67d9bd023a2a319c351e76e95 (diff) | |
| download | puppet-0b8893b3b8ffd391287a590b4f271edca70331da.tar.gz puppet-0b8893b3b8ffd391287a590b4f271edca70331da.tar.xz puppet-0b8893b3b8ffd391287a590b4f271edca70331da.zip | |
Fixed #832. Added the '--no-daemonize' option to puppetd and puppetmasterd.
The default behavior of 'verbose' and 'debug' no longer cause puppetd and
puppetmasterd to not daemonize.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/defaults.rb | 8 | ||||
| -rw-r--r-- | lib/puppet/util/settings.rb | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb index c1f31e467..538a3335f 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -117,6 +117,8 @@ module Puppet # Load all of the configuration parameters. require 'puppet/defaults' + # Prints the contents of a config file with the available config elements, or it + # prints a single value of a config element. def self.genconfig if Puppet[:configprint] != "" val = Puppet[:configprint] 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", diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index 1478cd8a5..ab55fbd2b 100644 --- a/lib/puppet/util/settings.rb +++ b/lib/puppet/util/settings.rb @@ -562,7 +562,7 @@ class Puppet::Util::Settings return transport.to_configuration end - # Convert our list of objects into a configuration file. + # Convert our list of config elements into a configuration file. def to_config str = %{The configuration file for #{Puppet[:name]}. Note that this file is likely to have unused configuration parameters in it; any parameter that's |