diff options
Diffstat (limited to 'lib/puppet/reference/configuration.rb')
| -rw-r--r-- | lib/puppet/reference/configuration.rb | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/lib/puppet/reference/configuration.rb b/lib/puppet/reference/configuration.rb index 6c40c86ba..60cbb8639 100644 --- a/lib/puppet/reference/configuration.rb +++ b/lib/puppet/reference/configuration.rb @@ -53,20 +53,20 @@ the parameters below, but not all of the arguments make sense for every executab I have tried to be as thorough as possible in the descriptions of the arguments, so it should be obvious whether an argument is appropriate or not. -These parameters can be supplied to the executables either as command-line +These parameters can be supplied to the executables either as command-line options or in the configuration file. For instance, the command-line invocation below would set the configuration directory to ``/private/puppet``:: - + $ puppetd --confdir=/private/puppet - + Note that boolean options are turned on and off with a slightly different syntax on the command line:: $ puppetd --storeconfigs - + $ puppetd --no-storeconfigs -The invocations above will enable and disable, respectively, the storage of +The invocations above will enable and disable, respectively, the storage of the client configuration. Configuration Files @@ -95,7 +95,7 @@ The file follows INI-style formatting. Here is an example of a very simple [main] confdir = /private/puppet storeconfigs = true - + Note that boolean parameters must be explicitly specified as `true` or `false` as seen above. @@ -112,13 +112,13 @@ will print a template configuration to standard output, which can be redirected to a file like so:: $ puppetd --genconfig > /etc/puppet/puppet.conf - + Note that this invocation will replace the contents of any pre-existing `puppet.conf` file, so make a backup of your present config if it contains valuable information. Like the `--genconfig` argument, the executables also accept a `--genmanifest` -argument, which will generate a manifest that can be used to manage all of +argument, which will generate a manifest that can be used to manage all of Puppet's directories and files and prints it to standard output. This can likewise be redirected to a file:: @@ -128,16 +128,16 @@ Puppet can also create user and group accounts for itself (one `puppet` group and one `puppet` user) if it is invoked as `root` with the `--mkusers` argument:: $ puppetd --mkusers - + Signals ------- -The ``puppetd`` and ``puppetmasterd`` executables catch some signals for special -handling. Both daemons catch (``SIGHUP``), which forces the server to restart -tself. Predictably, interrupt and terminate (``SIGINT`` and ``SIGTERM``) will shut +The ``puppetd`` and ``puppetmasterd`` executables catch some signals for special +handling. Both daemons catch (``SIGHUP``), which forces the server to restart +tself. Predictably, interrupt and terminate (``SIGINT`` and ``SIGTERM``) will shut down the server, whether it be an instance of ``puppetd`` or ``puppetmasterd``. -Sending the ``SIGUSR1`` signal to an instance of ``puppetd`` will cause it to -immediately begin a new configuration transaction with the server. This +Sending the ``SIGUSR1`` signal to an instance of ``puppetd`` will cause it to +immediately begin a new configuration transaction with the server. This signal has no effect on ``puppetmasterd``. Configuration Parameter Reference |