diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-09-27 23:49:02 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-09-27 23:49:02 -0300 |
| commit | 19105836d42aea250da8f34b3ea29fa5338f2eb5 (patch) | |
| tree | f85959740d78f2ac8f018350748c16507ca12d41 | |
| parent | 68febbb01d3226c2159f6d70440a9154f467fd03 (diff) | |
| download | puppet-nginx-19105836d42aea250da8f34b3ea29fa5338f2eb5.tar.gz puppet-nginx-19105836d42aea250da8f34b3ea29fa5338f2eb5.tar.bz2 | |
Introducing $puppetmaster_certname
| -rw-r--r-- | manifests/init.pp | 4 | ||||
| -rw-r--r-- | templates/puppetmaster.conf.erb | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 4df1af6..a51fe67 100644 --- 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 d3189c3..f8590c2 100644 --- 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; |