diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/defaults.rb | 8 | ||||
| -rw-r--r-- | lib/puppet/reference/configuration.rb | 12 | ||||
| -rw-r--r-- | lib/puppet/util/settings.rb | 2 |
4 files changed, 17 insertions, 7 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/reference/configuration.rb b/lib/puppet/reference/configuration.rb index 4b09002b8..c37b2e7dd 100644 --- a/lib/puppet/reference/configuration.rb +++ b/lib/puppet/reference/configuration.rb @@ -73,10 +73,14 @@ the client configuration. Configuration Files +++++++++++++++++++ -As mentioned above, the configuration parameters can also be stored in a -configuration file, located in the configuration directory (`/etc/puppet` -by default). As of 0.23.0, all executables look for ``puppet.conf`` in their -configuration directory (although they previously looked for separate files). +As mentioned above, the configuration parameters can also be stored in a +configuration file, located in the configuration directory. As root, the +default configuration directory is ``/etc/puppet``, and as a regular user, the +default configuration directory is ``~user/.puppet``. As of 0.23.0, all +executables look for ``puppet.conf`` in their configuration directory +(although they previously looked for separate files). For example, +``puppet.conf`` is located at ``/etc/puppet/puppet.conf`` as root and +``~user/.puppet/puppet.conf`` as a regular user by default. All executables will set any parameters set within the ``main`` section, while each executable will also look for a section named for the executable 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 |