summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-06-03 22:22:52 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-06-03 22:22:52 -0300
commit35854c6de09df5ab5a5d374cbe31bc8571dfa07b (patch)
treefb48b4acb2000976282e6b36f890d0818727ccce
parent1d0a620a9a28d78a961c6197b39e4280f5657775 (diff)
downloadpuppet-nginx-35854c6de09df5ab5a5d374cbe31bc8571dfa07b.tar.gz
puppet-nginx-35854c6de09df5ab5a5d374cbe31bc8571dfa07b.tar.bz2
Rollback from last change
-rw-r--r--templates/puppetmaster.conf.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/puppetmaster.conf.erb b/templates/puppetmaster.conf.erb
index c2dcb00..d3189c3 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/puppet.<%= domain %>.pem;
-ssl_certificate_key /var/lib/puppetmaster/ssl/private_keys/puppet.<%= domain %>.pem;
+ssl_certificate /var/lib/puppetmaster/ssl/certs/<%= fqdn %>.pem;
+ssl_certificate_key /var/lib/puppetmaster/ssl/private_keys/<%= fqdn %>.pem;
ssl_client_certificate /var/lib/puppetmaster/ssl/certs/ca.pem;
ssl_ciphers SSLv2:-LOW:-EXPORT:RC4+RSA;
ssl_session_cache shared:SSL:8m;