diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2010-06-03 22:04:47 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2010-06-03 22:04:47 -0300 |
commit | 1d0a620a9a28d78a961c6197b39e4280f5657775 (patch) | |
tree | 77a355b813388f5b4f3c1271529915662127aa22 | |
parent | 92be047d5c5d1bf8c10c2becdc1423a2065e3f08 (diff) | |
download | puppet-nginx-1d0a620a9a28d78a961c6197b39e4280f5657775.tar.gz puppet-nginx-1d0a620a9a28d78a961c6197b39e4280f5657775.tar.bz2 |
Using puppet.$domain for puppetmaster config
-rw-r--r-- | templates/puppetmaster.conf.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/puppetmaster.conf.erb b/templates/puppetmaster.conf.erb index d3189c3..c2dcb00 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/puppet.<%= domain %>.pem; +ssl_certificate_key /var/lib/puppetmaster/ssl/private_keys/puppet.<%= domain %>.pem; ssl_client_certificate /var/lib/puppetmaster/ssl/certs/ca.pem; ssl_ciphers SSLv2:-LOW:-EXPORT:RC4+RSA; ssl_session_cache shared:SSL:8m; |