diff options
| author | Luke Kanies <luke@madstop.com> | 2008-03-31 21:03:56 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-03-31 21:03:56 -0500 |
| commit | 1ad0ceca6cd06f03279125f1f39f11a0beec310b (patch) | |
| tree | cf00bb1e82ec0d0661421574ef27a268043b8c72 | |
| parent | 6f32e95ce25fb6de40836cb7c7678f39c5e77879 (diff) | |
| parent | f927b97f9ba454dab23255a259642b6b5dc1aae9 (diff) | |
| download | puppet-1ad0ceca6cd06f03279125f1f39f11a0beec310b.tar.gz puppet-1ad0ceca6cd06f03279125f1f39f11a0beec310b.tar.xz puppet-1ad0ceca6cd06f03279125f1f39f11a0beec310b.zip | |
Merge commit 'turnbull/0.24.x' into 0.24.x
| -rw-r--r-- | ext/ldap/puppet.schema | 2 | ||||
| -rw-r--r-- | lib/puppet/network/xmlrpc/client.rb | 5 | ||||
| -rw-r--r-- | lib/puppet/reports/rrdgraph.rb | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/ext/ldap/puppet.schema b/ext/ldap/puppet.schema index bbad23eab..d8dc4260d 100644 --- a/ext/ldap/puppet.schema +++ b/ext/ldap/puppet.schema @@ -12,7 +12,7 @@ attributetype ( 1.1.3.9 NAME 'parentnode' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) -attributetype ( 1.1.3.9 NAME 'environment' +attributetype ( 1.1.3.11 NAME 'environment' DESC 'Puppet Node Environment' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb index f6a5e8db6..357a766a1 100644 --- a/lib/puppet/network/xmlrpc/client.rb +++ b/lib/puppet/network/xmlrpc/client.rb @@ -49,6 +49,11 @@ module Puppet::Network self.recycle_connection retry end + ["certificate verify failed", "hostname was not match", "hostname not match"].each do |str| + if detail.message.include?(str) + Puppet.warning "Certificate validation failed; considering using the certname configuration option" + end + end raise XMLRPCClientError, "Certificates were not trusted: %s" % detail rescue ::XMLRPC::FaultException => detail diff --git a/lib/puppet/reports/rrdgraph.rb b/lib/puppet/reports/rrdgraph.rb index 2611f0369..03d8a5bdd 100644 --- a/lib/puppet/reports/rrdgraph.rb +++ b/lib/puppet/reports/rrdgraph.rb @@ -1,8 +1,10 @@ Puppet::Reports.register_report(:rrdgraph) do desc "Graph all available data about hosts using the RRD library. You must have the Ruby RRDtool library installed to use this report, which - you can get from `the RubyRRDTool RubyForge page`_. This package requires - the binary rrdtool2 package to be installed. + you can get from `the RubyRRDTool RubyForge page`_. This package may also + be available as ``ruby-rrd`` or ``rrdtool-ruby`` in your distribution's package + management system. The library and/or package will both require the binary + ``rrdtool`` package from your distribution to be installed. .. _the RubyRRDTool RubyForge page: http://rubyforge.org/projects/rubyrrdtool/ |