aboutsummaryrefslogtreecommitdiffstats
path: root/modules/apache
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2010-11-30 19:21:48 +0000
committerMichael Scherer <misc@mageia.org>2010-11-30 19:21:48 +0000
commitbcad30d0b9b46d7be743879a247b968844032cfd (patch)
treef01a3d638cfcd934a055dd32f02c956872b29d19 /modules/apache
parent6320ff91226d3f9419c51aeb36a0948600eba798 (diff)
downloadpuppet-bcad30d0b9b46d7be743879a247b968844032cfd.tar
puppet-bcad30d0b9b46d7be743879a247b968844032cfd.tar.gz
puppet-bcad30d0b9b46d7be743879a247b968844032cfd.tar.bz2
puppet-bcad30d0b9b46d7be743879a247b968844032cfd.tar.xz
puppet-bcad30d0b9b46d7be743879a247b968844032cfd.zip
enable SNI and use one certificate per vhost for catalyst application
Diffstat (limited to 'modules/apache')
-rw-r--r--modules/apache/templates/vhost_catalyst_app.conf6
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/apache/templates/vhost_catalyst_app.conf b/modules/apache/templates/vhost_catalyst_app.conf
index 57867fc4..fcdd9ce1 100644
--- a/modules/apache/templates/vhost_catalyst_app.conf
+++ b/modules/apache/templates/vhost_catalyst_app.conf
@@ -8,14 +8,12 @@ end
<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