Revision

488

Author

misc

Date

2010-11-30 20:21:48 +0100 (Tue, 30 Nov 2010)

Log Message

enable SNI and use one certificate per vhost for catalyst application

Modified Paths

• puppet/modules/apache/templates/vhost_catalyst_app.conf

Modified: puppet/modules/apache/templates/vhost_catalyst_app.conf
===================================================================
--- puppet/modules/apache/templates/vhost_catalyst_app.conf	2010-11-30 19:21:47 UTC (rev 487)
+++ puppet/modules/apache/templates/vhost_catalyst_app.conf	2010-11-30 19:21:48 UTC (rev 488)
@@ -8,14 +8,12 @@
 <VirtualHost *:<%= port %>>
 <% if use_ssl then %>
         SSLEngine on
-        #TODO deploy SNI later 
-        SSLCertificateFile /etc/ssl/apache/apache.pem
-        SSLCertificateKeyFile /etc/ssl/apache/apache.pem
+        SSLCertificateFile /etc/ssl/apache/<%= name %>.pem
+        SSLCertificateKeyFile /etc/ssl/apache/<%= name %>.pem
 <% end %>
         ServerName <%= name %>
         # Serve static content directly
         DocumentRoot  /dev/null
-# header 
 
 <% if location then %>
         Alias /static <%= location %>/root/static