diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-07-26 13:11:17 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-07-26 13:11:17 -0700 |
| commit | d88923bb830336d7f5fc1e0809923e9a69126995 (patch) | |
| tree | 01ace2791bae85f9013ac808328c1c110ca3e0f7 /lib/puppet/indirector | |
| parent | b13427b56d8529731d0334d420b24a592ecb43ea (diff) | |
| parent | 4857ac928ccf1bd56d513eae201b57b12dd14a38 (diff) | |
| download | puppet-d88923bb830336d7f5fc1e0809923e9a69126995.tar.gz puppet-d88923bb830336d7f5fc1e0809923e9a69126995.tar.xz puppet-d88923bb830336d7f5fc1e0809923e9a69126995.zip | |
Merge branch '2.7.x'
* 2.7.x:
maint: Suggest where to start troubleshooting SSL error message
maint: Fix cert app to print help and exit if no subcommand
Diffstat (limited to 'lib/puppet/indirector')
| -rw-r--r-- | lib/puppet/indirector/rest.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/indirector/rest.rb b/lib/puppet/indirector/rest.rb index 8018fe8e3..19daff51d 100644 --- a/lib/puppet/indirector/rest.rb +++ b/lib/puppet/indirector/rest.rb @@ -93,7 +93,9 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus http_connection.send(method, *args) rescue OpenSSL::SSL::SSLError => error - if error.message.include? "hostname was not match" + if error.message.include? "certificate verify failed" + raise Puppet::Error, "#{error.message}. This is often because the time is out of sync on the server or client" + elsif error.message.include? "hostname was not match" raise unless cert = peer_certs.find { |c| c.name !~ /^puppet ca/i } valid_certnames = [cert.name, *cert.alternate_names].uniq |