Merge branch 'tickets/0.24.x/1168' of git://github.com/lak/puppet into 0.24.x

Conflicts:

	CHANGELOG

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 57299b7e7..472d98c4f 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -160,8 +160,12 @@ module Puppet
     end
 
     Puppet.setdefaults(:ssl,
-        :certname => [fqdn, "The name to use when handling certificates.  Defaults
-            to the fully qualified domain name."],
+        # We have to downcase the fqdn, because the current ssl stuff (as oppsed to in master) doesn't have good facilities for 
+        # manipulating naming.
+        :certname => {:default => fqdn.downcase, :desc => "The name to use when handling certificates.  Defaults
+            to the fully qualified domain name.",
+            :call_on_define => true, # Call our hook with the default value, so we're always downcased
+            :hook => proc { |value| raise(ArgumentError, "Certificate names must be lower case; see #1168") unless value == value.downcase }},
         :certdnsnames => ['', "The DNS names on the Server certificate as a colon-separated list.
             If it's anything other than an empty string, it will be used as an alias in the created
             certificate.  By default, only the server gets an alias set up, and only for 'puppet'."],