summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-11-23 15:49:32 -0600
committerLuke Kanies <luke@madstop.com>2007-11-23 15:49:32 -0600
commit7f504b00d8499de6dbd6e12987943b9a5b308d32 (patch)
tree5242d86ecf7e14c0bf73d4597bf70711c8737670 /lib/puppet
parent1cb40eca62ad9d3731524ac0b6272d41f8982e99 (diff)
downloadpuppet-7f504b00d8499de6dbd6e12987943b9a5b308d32.tar.gz
puppet-7f504b00d8499de6dbd6e12987943b9a5b308d32.tar.xz
puppet-7f504b00d8499de6dbd6e12987943b9a5b308d32.zip
Applying patch from #896 by whaymond_home, adding more
certname aliases.
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/defaults.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 400cc98fd..b4cd3d5de 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -162,8 +162,10 @@ module Puppet
Puppet.setdefaults(:ssl,
:certname => [fqdn, "The name to use when handling certificates. Defaults
to the fully qualified domain name."],
- :certdnsnames => ['*', "The DNS names on the Server certificate as a colon-
- separated list. Defaults to * (wildcard match for all names)."],
+ :certdnsnames => ['*:*.*:*.*.*:*.*.*.*:*.*.*.*.*:*.*.*.*.*.*', "The DNS
+ names on the Server certificate as a colon-separated list. Defaults
+ to wildcard match for all DNS names up to 6 dot-separated components
+ long."],
:certdir => ["$ssldir/certs", "The certificate directory."],
:publickeydir => ["$ssldir/public_keys", "The public key directory."],
:privatekeydir => { :default => "$ssldir/private_keys",