diff options
| author | Luke Kanies <luke@madstop.com> | 2008-05-06 19:02:45 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-05-06 19:02:45 -0500 |
| commit | dd4d8684fc19adcb68c681ba1c446a737498cda0 (patch) | |
| tree | 7dfd898ef167982ea905a542fed6066fb78768b7 /lib/puppet/network/http_pool.rb | |
| parent | 57c753419ac4700ab87689a3e3c3eb7302fff693 (diff) | |
| download | puppet-dd4d8684fc19adcb68c681ba1c446a737498cda0.tar.gz puppet-dd4d8684fc19adcb68c681ba1c446a737498cda0.tar.xz puppet-dd4d8684fc19adcb68c681ba1c446a737498cda0.zip | |
Fixing the HttpPool module to get rid of an infinite loop.
We can't have the HttpPool class use the Indirector to see
if it has a cert available, because it might be being used to
try to download one, which would cause it to make an http instance,
which would cause it to... Well, you get the idea.
Adding and fixing a few other tests I ran into on the way.
Diffstat (limited to 'lib/puppet/network/http_pool.rb')
| -rw-r--r-- | lib/puppet/network/http_pool.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/network/http_pool.rb b/lib/puppet/network/http_pool.rb index 9dd4a576a..24cbee656 100644 --- a/lib/puppet/network/http_pool.rb +++ b/lib/puppet/network/http_pool.rb @@ -50,7 +50,7 @@ module Puppet::Network::HttpPool # Use cert information from a Puppet client to set up the http object. def self.cert_setup(http) # Just no-op if we don't have certs. - return false unless ssl_host.certificate + return false unless FileTest.exist?(Puppet[:hostcert]) # ssl_host.certificate http.cert_store = ssl_host.ssl_store http.ca_file = Puppet[:localcacert] |