From 1d0a620a9a28d78a961c6197b39e4280f5657775 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 3 Jun 2010 22:04:47 -0300
Subject: Using puppet.$domain for puppetmaster config

---
 templates/puppetmaster.conf.erb | 4 ++--
 1 file 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;
-- 
cgit v1.2.3