diff options
| author | Nigel Kersten <nigelk@google.com> | 2009-07-31 17:36:50 -0700 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-08-04 07:53:29 +1000 |
| commit | cd224c6c9f5dedd27bb59822e240b5bae6202ab0 (patch) | |
| tree | f3ca083c26fbbecbbdc089037ba68416dbf4ea2a /lib/puppet/defaults.rb | |
| parent | 401a9ec546adab01afa1a62477010797bf6fb221 (diff) | |
| download | puppet-cd224c6c9f5dedd27bb59822e240b5bae6202ab0.tar.gz puppet-cd224c6c9f5dedd27bb59822e240b5bae6202ab0.tar.xz puppet-cd224c6c9f5dedd27bb59822e240b5bae6202ab0.zip | |
Fixes #2464, #2457. Deprecate reportserver for report_server. Add report_port setting. Add tests.
Diffstat (limited to 'lib/puppet/defaults.rb')
| -rw-r--r-- | lib/puppet/defaults.rb | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index b1fddc3a3..c45cf826f 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -542,8 +542,21 @@ module Puppet before considering it a failure. This can help reduce flapping if too many clients contact the server at one time." ], - :reportserver => ["$server", - "The server to which to send transaction reports." + :reportserver => { + :default => "$server", + :call_on_define => false, + :desc => "(Deprecated for 'report_server') The server to which to send transaction reports.", + :hook => proc do |value| + if value + Puppet.settings[:report_server] = value + end + end + }, + :report_server => ["$server", + "The server to which to send transaction reports." + ], + :report_port => ["$masterport", + "The port to communicate with the report_server." ], :report => [false, "Whether to send reports after every transaction." |