diff options
| author | nfagerlund <nick.fagerlund@gmail.com> | 2011-06-29 20:06:22 -0700 |
|---|---|---|
| committer | nfagerlund <nick.fagerlund@gmail.com> | 2011-06-29 20:06:22 -0700 |
| commit | d58eacd6b4abc804bc5326184ed59c309fd04149 (patch) | |
| tree | b71b984e241b252003d89529ac9f8bd0fc17d5d2 | |
| parent | 902c4147a2100c1f71d8493c526ae5275bab4cdc (diff) | |
| parent | 98cd89bdd44a68439ee4d030acc91fd0dda42707 (diff) | |
| download | puppet-d58eacd6b4abc804bc5326184ed59c309fd04149.tar.gz puppet-d58eacd6b4abc804bc5326184ed59c309fd04149.tar.xz puppet-d58eacd6b4abc804bc5326184ed59c309fd04149.zip | |
Merge branch 'ticket/2.7.x/8147' into 2.7.x
| -rw-r--r-- | lib/puppet/defaults.rb | 2 | ||||
| -rwxr-xr-x | spec/integration/defaults_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 07442d0e9..2247634b3 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -466,7 +466,7 @@ module Puppet :desc => "The directory in which to store reports received from the client. Each client gets a separate subdirectory."}, - :reporturl => ["http://localhost:3000/reports", + :reporturl => ["http://localhost:3000/reports/upload", "The URL used by the http reports processor to send reports"], :fileserverconfig => ["$confdir/fileserver.conf", "Where the fileserver configuration is stored."], :strict_hostname_checking => [false, "Whether to only search for the complete diff --git a/spec/integration/defaults_spec.rb b/spec/integration/defaults_spec.rb index 9bec769ab..8cf0e3e7b 100755 --- a/spec/integration/defaults_spec.rb +++ b/spec/integration/defaults_spec.rb @@ -275,6 +275,6 @@ describe "Puppet defaults" do describe "reporturl" do subject { Puppet.settings[:reporturl] } - it { should == "http://localhost:3000/reports" } + it { should == "http://localhost:3000/reports/upload" } end end |