lib/puppet/ssl/host.rb in puppet-2.6.12 vs lib/puppet/ssl/host.rb in puppet-2.6.13
- old
+ new
@@ -149,9 +149,11 @@
# If this is for the current machine...
if this_csr_is_for_the_current_host
# ...add our configured dns_alt_names
if Puppet[:dns_alt_names] and Puppet[:dns_alt_names] != ''
options[:dns_alt_names] ||= Puppet[:dns_alt_names]
+ elsif Puppet::SSL::CertificateAuthority.ca? and fqdn = Facter.value(:fqdn) and domain = Facter.value(:domain)
+ options[:dns_alt_names] = "puppet, #{fqdn}, puppet.#{domain}"
end
end
@certificate_request = CertificateRequest.new(name)
@certificate_request.generate(key.content, options)