From b1a6bcf43e726fbba7665070ee1ad6957066082e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@anarcat.ath.cx>
Date: Tue, 7 Oct 2008 18:34:02 +0000
Subject: [PATCH] create a apache2-specific SSL configuration file

---
 .gitattributes               | 1 +
 etc/alternc/apache2-ssl.conf | 6 ++++++
 install/alternc.install      | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 etc/alternc/apache2-ssl.conf

diff --git a/.gitattributes b/.gitattributes
index 7a2fb81f..b2c89bd1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -277,6 +277,7 @@ debian/rules -text
 debian/templates -text
 etc/alternc/apache-ssl.conf -text
 etc/alternc/apache.conf -text
+etc/alternc/apache2-ssl.conf -text
 etc/alternc/apache2.conf -text
 etc/alternc/menulist.txt -text
 etc/alternc/phpmyadmin.inc.php -text
diff --git a/etc/alternc/apache2-ssl.conf b/etc/alternc/apache2-ssl.conf
new file mode 100644
index 00000000..ef9d9e04
--- /dev/null
+++ b/etc/alternc/apache2-ssl.conf
@@ -0,0 +1,6 @@
+<VirtualHost *:443>
+	SSLEngine on
+    SSLCertificateFile /etc/alternc/apache.pem
+	DocumentRoot /var/alternc/bureau
+	Include /etc/alternc/bureau.conf
+</VirtualHost>
diff --git a/install/alternc.install b/install/alternc.install
index 9b095c9b..7ff8cc52 100644
--- a/install/alternc.install
+++ b/install/alternc.install
@@ -220,7 +220,7 @@ if [ -x /usr/sbin/apache2 ]; then
             s="apache2"
         fi
         if [ ! -h /etc/apache2/conf.d/alternc-ssl.conf ] && [ -e /etc/apache2/conf.d/ ]; then
-            ln -sf /etc/alternc/apache-ssl.conf /etc/apache2/conf.d/alternc-ssl.conf
+            ln -sf /etc/alternc/apache2-ssl.conf /etc/apache2/conf.d/alternc-ssl.conf
             s="apache2"
         fi
     else