From 026b48f8119d3a6728273c5138f602c63af5efcf Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 23 Oct 2007 14:11:43 -0400
Subject: [PATCH] Added shelluser creation plugin. Updated apache ssl cert creation.
---
server/conf/vhost.conf.master | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 986d9d6..d5199de 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -59,7 +59,9 @@
-<tmpl_if name='ssl' op='==' value='y'>
+<tmpl_if name='ssl_enabled'>
+
+<IfModule mod_ssl.c>
###########################################################
# SSL Vhost
###########################################################
@@ -77,6 +79,13 @@
ErrorDocument 405 /error/methodNotAllowed.html
ErrorDocument 500 /error/internalServerError.html
ErrorDocument 503 /error/overloaded.html
+
+ SSLEngine on
+ SSLCertificateFile <tmpl_var name='document_root'>/<tmpl_var name='domain'>.crt
+ SSLCertificateKeyFile <tmpl_var name='document_root'>/<tmpl_var name='domain'>.key
+<tmpl_if name='has_bundle_cert'>
+ SSLCACertificateFile <tmpl_var name='document_root'>/<tmpl_var name='domain'>.bundle
+</tmpl_if>
<tmpl_if name='alias'>
ServerAlias <tmpl_var name='alias'>
@@ -121,5 +130,6 @@
</tmpl_if>
</VirtualHost>
+</IfModule>
</tmpl_if>
\ No newline at end of file
--
Gitblit v1.9.1