summaryrefslogtreecommitdiffstats
path: root/lib/puppet.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-04-04 22:23:08 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-04-04 22:23:08 +0000
commitd8b4b0dbf35b2b183cd62adf591ebf4650448a0d (patch)
treed51d99be35d0702ffc08bd0e8a28e82d8daf2e6b /lib/puppet.rb
parentc0a9e5f2e9df8e6e1aed74653ae675029af8a9bb (diff)
downloadpuppet-d8b4b0dbf35b2b183cd62adf591ebf4650448a0d.tar.gz
puppet-d8b4b0dbf35b2b183cd62adf591ebf4650448a0d.tar.xz
puppet-d8b4b0dbf35b2b183cd62adf591ebf4650448a0d.zip
adding -e ability to puppet executable
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1065 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet.rb')
-rw-r--r--lib/puppet.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb
index 65a51458c..21747bdb5 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -143,6 +143,7 @@ module Puppet
"Whether to just print a manifest to stdout and exit. Only makes
sense when used interactively. Takes into account arguments specified
on the CLI."],
+ :color => [true, "Whether to use ANSI colors when logging to the console."],
:mkusers => [false,
"Whether to create the necessary user and group that puppetd will
run as."]
@@ -189,7 +190,9 @@ module Puppet
:owner => "root",
:mode => 0644,
:desc => "The file in which puppetd stores a list of the classes
- associated with the retrieved configuratiion."},
+ associated with the retrieved configuratiion. Can be loaded in
+ the separate ``puppet`` executable using the ``--loadclasses``
+ option."},
:puppetdlog => { :default => "$logdir/puppetd.log",
:owner => "root",
:mode => 0640,