diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/defaults.rb | 17 | ||||
| -rw-r--r-- | lib/puppet/indirector/report/rest.rb | 2 |
2 files changed, 17 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." diff --git a/lib/puppet/indirector/report/rest.rb b/lib/puppet/indirector/report/rest.rb index 905b71a5d..f92d1edd3 100644 --- a/lib/puppet/indirector/report/rest.rb +++ b/lib/puppet/indirector/report/rest.rb @@ -2,4 +2,6 @@ require 'puppet/indirector/rest' class Puppet::Transaction::Report::Rest < Puppet::Indirector::REST desc "Get server report over HTTP via REST." + use_server_setting(:report_server) + use_port_setting(:report_port) end |