diff options
| author | Luke Kanies <luke@madstop.com> | 2008-06-16 10:56:55 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-06-16 10:56:55 -0500 |
| commit | 49016bb29312bfeb6f41ce420159e6ffc477eebe (patch) | |
| tree | 7ce6fcf5f2c37519617915a3e79d487bdf5296ce /lib/puppet | |
| parent | 6b69a86e48be082a6d03ce69f2700c4c874e222f (diff) | |
| parent | 5273b22b4fda6f9aa7a8366a1dfbae092594d391 (diff) | |
| download | puppet-49016bb29312bfeb6f41ce420159e6ffc477eebe.tar.gz puppet-49016bb29312bfeb6f41ce420159e6ffc477eebe.tar.xz puppet-49016bb29312bfeb6f41ce420159e6ffc477eebe.zip | |
Merge branch '0.24.x'
Conflicts:
CHANGELOG
lib/puppet/defaults.rb
spec/integration/defaults.rb
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/defaults.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index d77ec0486..fb4d67a91 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -167,8 +167,12 @@ module Puppet end Puppet.setdefaults(:main, - :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'."], |