From e36a4b85ee9a2246de3ebfb277cf9776992a3b91 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Thu, 7 Feb 2019 14:06:05 -0800
Subject: [PATCH] apache: Add support for mod_ssl in addition to mod_gnutls

Depending on which module is enabled, different configuration is used.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 .../freedombox-tls-site-macro.conf            | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/data/etc/apache2/conf-available/freedombox-tls-site-macro.conf b/data/etc/apache2/conf-available/freedombox-tls-site-macro.conf
index b4d93b22c..8d5549b34 100644
--- a/data/etc/apache2/conf-available/freedombox-tls-site-macro.conf
+++ b/data/etc/apache2/conf-available/freedombox-tls-site-macro.conf
@@ -1,4 +1,6 @@
 <Macro FreedomBoxTLSSiteMacro $domain>
+
+    # mod_gnutls default options. See /etc/apache2/site-available/default-tls.conf
     <IfModule mod_gnutls.c>
         <VirtualHost _default_:443>
             ServerAdmin webmaster@localhost
@@ -16,4 +18,28 @@
             GnuTLSPriorities NORMAL
         </VirtualHost>
     </IfModule>
+
+    # mod_ssl default options. See /etc/apache2/site-available/default-ssl.conf
+    <IfModule mod_ssl.c>
+        <VirtualHost _default_:443>
+            ServerAdmin webmaster@localhost
+            ServerName $domain
+            DocumentRoot /var/www/html
+
+            ErrorLog ${APACHE_LOG_DIR}/error.log
+            CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+            SSLEngine on
+            # Automatically obtained certificates from Let's Encrypt
+            SSLCertificateFile /etc/letsencrypt/live/$domain/fullchain.pem
+            SSLCertificateKeyFile /etc/letsencrypt/live/$domain/privkey.pem
+
+            <FilesMatch "\.(cgi|shtml|phtml|php)$">
+                SSLOptions +StdEnvVars
+            </FilesMatch>
+            <Directory /usr/lib/cgi-bin>
+                SSLOptions +StdEnvVars
+            </Directory>
+        </VirtualHost>
+    </IfModule>
 </Macro>