diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-07-13 15:14:40 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-07-13 15:14:40 -0700 |
| commit | b1526216d1e47726bae78a884a0db2666101e34a (patch) | |
| tree | 6a76d6e1a363856cc0c60e6c55f2b1f76ec7be0f | |
| parent | a0b658f24fb664c61c271771609d3ce5652cf0fd (diff) | |
| parent | b84bdbf31bbb0c5d5501bf6f32a9c0d0dc6acc94 (diff) | |
| download | puppet-b1526216d1e47726bae78a884a0db2666101e34a.tar.gz puppet-b1526216d1e47726bae78a884a0db2666101e34a.tar.xz puppet-b1526216d1e47726bae78a884a0db2666101e34a.zip | |
Merge branch 'ticket/master/8356-color-setting-on-windows'
* ticket/master/8356-color-setting-on-windows:
(#8356) Specify setting type for color
| -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 488b991d7..d5e06c54a 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -47,10 +47,14 @@ module Puppet exits. Comma-separate multiple values. For a list of all values, specify 'all'. This feature is only available in Puppet versions higher than 0.18.4."], - :color => [(Puppet.features.microsoft_windows? ? "false" : "ansi"), "Whether to use colors when logging to the console. + :color => { + :default => (Puppet.features.microsoft_windows? ? "false" : "ansi"), + :type => :setting, + :desc => "Whether to use colors when logging to the console. Valid values are `ansi` (equivalent to `true`), `html` (mostly used during testing with TextMate), and `false`, which produces - no color."], + no color.", + }, :mkusers => [false, "Whether to create the necessary user and group that puppet agent will run as."], |