@@ -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'."], lib/puppet/defaults.rb @@ -5,8 +5,9 @@ require File.dirname(__FILE__) + '/../spec_helper' require 'puppet/defaults' describe "Puppet defaults" do + after { Puppet.settings.clear } + describe "when setting the :factpath" do - after { Puppet.settings.clear } it "should add the :factpath to Facter's search paths" do Facter.expects(:search).with("/my/fact/path") @@ -14,4 +15,9 @@ describe "Puppet defaults" do Puppet.settings[:factpath] = "/my/fact/path" end end + describe "when setting the :certname" do + it "should fail if the certname is not downcased" do + lambda { Puppet.settings[:certname] = "Host.Domain.Com" }.should raise_error(ArgumentError) + end + end end spec/integration/defaults.rb 6b69a86e48be082a6d03ce69f2700c4c874e222f 5273b22b4fda6f9aa7a8366a1dfbae092594d391 Luke Kanies luke@madstop.com http://github.com/shadoi/puppet/commit/49016bb29312bfeb6f41ce420159e6ffc477eebe 49016bb29312bfeb6f41ce420159e6ffc477eebe 2008-06-16T08:56:55-07:00 2008-06-16T08:56:55-07:00 Merge branch '0.24.x' Conflicts: CHANGELOG lib/puppet/defaults.rb spec/integration/defaults.rb 7ce6fcf5f2c37519617915a3e79d487bdf5296ce Luke Kanies luke@madstop.com