summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-06-03 17:31:23 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-06-03 17:31:23 -0300
commitad8cea4180f37cefe7ee36b3550af7964554bf5d (patch)
treeb62d25967758abaa846f21a70cbd13c7d6f242dd
parent7493739061e3db946c7e2b5661d073772197d719 (diff)
downloadpuppet-nginx-ad8cea4180f37cefe7ee36b3550af7964554bf5d.tar.gz
puppet-nginx-ad8cea4180f37cefe7ee36b3550af7964554bf5d.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 9671bb3..9cf36b1 100644
--- a/templates/puppetmaster.conf.erb
+++ b/templates/puppetmaster.conf.erb
@@ -4,8 +4,8 @@
# service in Puppet.
ssl on;
-ssl_certificate /var/lib/puppet/ssl/certs/puppet.<%= domain %>.pem;
-ssl_certificate_key /var/lib/puppet/ssl/private_keys/puppet.<%= domain %>.pem;
+ssl_certificate /var/lib/puppet/ssl/certs/<%= fqdn %>.pem;
+ssl_certificate_key /var/lib/puppet/ssl/private_keys/<%= fqdn %>.pem;
ssl_client_certificate /var/lib/puppet/ssl/certs/ca.pem;
ssl_ciphers SSLv2:-LOW:-EXPORT:RC4+RSA;
ssl_session_cache shared:SSL:8m;