From ea48ece55aeb31a9ddad6d0aa9ddeb71d05ac063 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@alternc.org>
Date: Sun, 27 Mar 2011 21:22:56 +0000
Subject: [PATCH] fixing error with HTTPS telling there is virtualhost inside
 virtualhost. To be tested

---
 etc/alternc/apache2-ssl.conf              | 13 ++++++++-----
 etc/alternc/apache2.conf                  |  6 +++++-
 etc/alternc/templates/alternc/bureau.conf |  3 +--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/etc/alternc/apache2-ssl.conf b/etc/alternc/apache2-ssl.conf
index fa79dea6..36645f7a 100644
--- a/etc/alternc/apache2-ssl.conf
+++ b/etc/alternc/apache2-ssl.conf
@@ -1,7 +1,10 @@
 <VirtualHost *:443>
-	SSLEngine on
-      SSLCertificateFile /etc/alternc/apache.pem
-      SSLCaCertificatePath /etc/ssl/certs
-	DocumentRoot /var/alternc/bureau
-	Include /etc/alternc/bureau.conf
+
+  Include /etc/alternc/bureau.conf
+
+  SSLEngine on
+  SSLCertificateFile /etc/alternc/apache.pem
+  SSLCaCertificatePath /etc/ssl/certs
+
 </VirtualHost>
+
diff --git a/etc/alternc/apache2.conf b/etc/alternc/apache2.conf
index 198a56e0..ff20e0e6 100644
--- a/etc/alternc/apache2.conf
+++ b/etc/alternc/apache2.conf
@@ -63,5 +63,9 @@ ScriptAlias /cgi-bin/ /var/alternc/cgi-bin/
   Allow from all
 </Directory>
 
-Include /etc/alternc/bureau.conf
+<VirtualHost *:80>
+  Include /etc/alternc/bureau.conf
+</VirtualHost>
+
+
 Include /var/alternc/apache-vhost/vhosts_all.conf
diff --git a/etc/alternc/templates/alternc/bureau.conf b/etc/alternc/templates/alternc/bureau.conf
index 896925d8..4c8d7320 100644
--- a/etc/alternc/templates/alternc/bureau.conf
+++ b/etc/alternc/templates/alternc/bureau.conf
@@ -1,4 +1,4 @@
-<VirtualHost *:80>
+
   DocumentRoot /var/alternc/bureau/admin
   ServerName %%fqdn%%
   RewriteEngine on
@@ -7,4 +7,3 @@
   alias /sql        /usr/share/phpmyadmin
   alias /webmail          /usr/share/squirrelmail
   
-</VirtualHost>