aboutsummaryrefslogtreecommitdiffstats
path: root/modules/apache
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2010-11-08 00:37:59 +0000
committerMichael Scherer <misc@mageia.org>2010-11-08 00:37:59 +0000
commit699faea3e57d0a7708370aeb7ef6de2edd9365ac (patch)
treef8a420f92e5b15c13d7f7c1fc01c9f42f77b0efa /modules/apache
parent6e20d33467288b1ee3bf2a78b48fc4492c108489 (diff)
downloadpuppet-699faea3e57d0a7708370aeb7ef6de2edd9365ac.tar
puppet-699faea3e57d0a7708370aeb7ef6de2edd9365ac.tar.gz
puppet-699faea3e57d0a7708370aeb7ef6de2edd9365ac.tar.bz2
puppet-699faea3e57d0a7708370aeb7ef6de2edd9365ac.tar.xz
puppet-699faea3e57d0a7708370aeb7ef6de2edd9365ac.zip
- add logic for using ssl certificate ( no SNI for the moment, but should be done later )
Diffstat (limited to 'modules/apache')
-rw-r--r--modules/apache/templates/vhost_catalyst_app.conf15
1 files changed, 14 insertions, 1 deletions
diff --git a/modules/apache/templates/vhost_catalyst_app.conf b/modules/apache/templates/vhost_catalyst_app.conf
index a3aee804..631067ef 100644
--- a/modules/apache/templates/vhost_catalyst_app.conf
+++ b/modules/apache/templates/vhost_catalyst_app.conf
@@ -1,4 +1,17 @@
-<VirtualHost *:80>
+<% if use_ssl then
+ port = 443
+else
+ port = 80
+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
+<% end %>
ServerName <%= name %>
# Serve static content directly
DocumentRoot /dev/null