summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-06-03 16:49:49 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-06-03 16:49:49 -0300
commit7493739061e3db946c7e2b5661d073772197d719 (patch)
tree1be9bd6d0f84b89c44c47b2b5bd55b7b6c78bb93
parent34231dc1ffbb79db55a82060cf62b9d12748230f (diff)
downloadpuppet-nginx-7493739061e3db946c7e2b5661d073772197d719.tar.gz
puppet-nginx-7493739061e3db946c7e2b5661d073772197d719.tar.bz2
Using puppet.$domain instead of $fqdn at nginx config
-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 9cf36b1..9671bb3 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/<%= fqdn %>.pem;
-ssl_certificate_key /var/lib/puppet/ssl/private_keys/<%= fqdn %>.pem;
+ssl_certificate /var/lib/puppet/ssl/certs/puppet.<%= domain %>.pem;
+ssl_certificate_key /var/lib/puppet/ssl/private_keys/puppet.<%= domain %>.pem;
ssl_client_certificate /var/lib/puppet/ssl/certs/ca.pem;
ssl_ciphers SSLv2:-LOW:-EXPORT:RC4+RSA;
ssl_session_cache shared:SSL:8m;