summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorBrice Figureau <brice-puppet@daysofwonder.com>2009-07-20 20:56:23 +0200
committerJames Turnbull <james@lovedthanlost.net>2009-07-21 08:05:57 +1000
commitc65974376700f54548a9412e04889ad54be84ff9 (patch)
treed5b649ef74ba9b23b908acf5fc3e7744a976cde3 /lib/puppet
parent17205bb4e5d246f7a47b995826927a38b83fb3d0 (diff)
downloadpuppet-c65974376700f54548a9412e04889ad54be84ff9.tar.gz
puppet-c65974376700f54548a9412e04889ad54be84ff9.tar.xz
puppet-c65974376700f54548a9412e04889ad54be84ff9.zip
Fix #2425 - make sure client can contact CA server with REST
The various REST SSL terminii were never setup to use the ca_server/ca_port if one is setup. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/indirector/certificate/rest.rb3
-rw-r--r--lib/puppet/indirector/certificate_request/rest.rb3
-rw-r--r--lib/puppet/indirector/certificate_revocation_list/rest.rb3
3 files changed, 9 insertions, 0 deletions
diff --git a/lib/puppet/indirector/certificate/rest.rb b/lib/puppet/indirector/certificate/rest.rb
index f88d60d40..599983030 100644
--- a/lib/puppet/indirector/certificate/rest.rb
+++ b/lib/puppet/indirector/certificate/rest.rb
@@ -3,4 +3,7 @@ require 'puppet/indirector/rest'
class Puppet::SSL::Certificate::Rest < Puppet::Indirector::REST
desc "Find and save certificates over HTTP via REST."
+
+ use_server_setting(:ca_server)
+ use_port_setting(:ca_port)
end
diff --git a/lib/puppet/indirector/certificate_request/rest.rb b/lib/puppet/indirector/certificate_request/rest.rb
index 6df014583..eb9e8a9ce 100644
--- a/lib/puppet/indirector/certificate_request/rest.rb
+++ b/lib/puppet/indirector/certificate_request/rest.rb
@@ -3,4 +3,7 @@ require 'puppet/indirector/rest'
class Puppet::SSL::CertificateRequest::Rest < Puppet::Indirector::REST
desc "Find and save certificate requests over HTTP via REST."
+
+ use_server_setting(:ca_server)
+ use_port_setting(:ca_port)
end
diff --git a/lib/puppet/indirector/certificate_revocation_list/rest.rb b/lib/puppet/indirector/certificate_revocation_list/rest.rb
index 13cc95c87..6d97ce1e2 100644
--- a/lib/puppet/indirector/certificate_revocation_list/rest.rb
+++ b/lib/puppet/indirector/certificate_revocation_list/rest.rb
@@ -3,4 +3,7 @@ require 'puppet/indirector/rest'
class Puppet::SSL::CertificateRevocationList::Rest < Puppet::Indirector::REST
desc "Find and save certificate revocation lists over HTTP via REST."
+
+ use_server_setting(:ca_server)
+ use_port_setting(:ca_port)
end