Introducing $puppetmaster_certname

diff --git a/manifests/init.pp b/manifests/init.pp
index 4df1af6de76ceefc2108401b1dbb6f2c62f84b28..a51fe678c4d6b8caae154d0f5cc30d08572bd142 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -133,6 +133,10 @@ class nginx::puppetmaster inherits nginx::base {
     default => $puppetmaster_puppetmasters,
   }
 
+  case $puppetmaster_certname {
+    '': { $puppetmaster_certname = "puppet,$domain" }
+  }
+
   $worker_connections   = 1024
   $ssl_port             = 8140
   $non_ssl_port         = 8141

diff --git a/templates/puppetmaster.conf.erb b/templates/puppetmaster.conf.erb
index d3189c3e6ef8f67782332e24e233d3066bc851b4..f8590c2375c6bb0597233a7d1643b5896d71b59b 100644 (file)
--- a/templates/puppetmaster.conf.erb
+++ b/templates/puppetmaster.conf.erb
@@ -4,8 +4,8 @@
 # service in Puppet.
 
 ssl                     on;
-ssl_certificate         /var/lib/puppetmaster/ssl/certs/<%= fqdn %>.pem;
-ssl_certificate_key     /var/lib/puppetmaster/ssl/private_keys/<%= fqdn %>.pem;
+ssl_certificate         /var/lib/puppetmaster/ssl/certs/<%= puppetmaster_certname %>.pem;
+ssl_certificate_key     /var/lib/puppetmaster/ssl/private_keys/<%= puppetmaster_certname %>.pem;
 ssl_client_certificate  /var/lib/puppetmaster/ssl/certs/ca.pem;
 ssl_ciphers             SSLv2:-LOW:-EXPORT:RC4+RSA;
 ssl_session_cache       shared:SSL:8m;