summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-03-23 00:16:01 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-03-23 00:16:01 -0300
commitd4e64d20e93ec3dc120998f229abeb5070cc7571 (patch)
treeb3bbf156f2a1cb02e7a2a022ad5c951c06250d5f
parent9feaff79cdff8dc3baa779da27ac6ddd93ad18da (diff)
downloadpuppet-nginx-d4e64d20e93ec3dc120998f229abeb5070cc7571.tar.gz
puppet-nginx-d4e64d20e93ec3dc120998f229abeb5070cc7571.tar.bz2
Rollback from last commit
-rw-r--r--templates/puppetmaster.conf.erb6
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/puppetmaster.conf.erb b/templates/puppetmaster.conf.erb
index 9cf36b1..d3189c3 100644
--- a/templates/puppetmaster.conf.erb
+++ b/templates/puppetmaster.conf.erb
@@ -4,9 +4,9 @@
# service in Puppet.
ssl on;
-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_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;
ssl_session_timeout 5m;