From e8c4e732eaf8f6686f9d5ef78fda2a1e3360d68b Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Wed, 1 Sep 2021 16:46:07 -0700
Subject: [PATCH] apache: Drop support for GnuTLS

- We have switched to mod_ssl long time ago and are no longer using mod_gnutls.

- It is additional effort configure and test mod_gnutls.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 .../freedombox-tls-site-macro.conf            | 20 -------------------
 .../apache2/sites-available/plinth-ssl.conf   |  2 +-
 2 files changed, 1 insertion(+), 21 deletions(-)

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 168dec448..9f8389408 100644
--- a/data/etc/apache2/conf-available/freedombox-tls-site-macro.conf
+++ b/data/etc/apache2/conf-available/freedombox-tls-site-macro.conf
@@ -1,25 +1,5 @@
 <Macro FreedomBoxTLSSiteMacro $domain>
 
-    # mod_gnutls default options. See /etc/apache2/sites-available/default-tls.conf
-    <IfModule mod_gnutls.c>
-        <VirtualHost _default_:443>
-            ServerAdmin webmaster@localhost
-            ServerName $domain
-            DocumentRoot /var/www/html
-
-            ErrorLog ${APACHE_LOG_DIR}/error.log
-            CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined
-
-            GnuTLSEnable On
-
-            # Automatically obtained certificates from Let's Encrypt
-            GnuTLSCertificateFile /etc/letsencrypt/live/$domain/fullchain.pem
-            GnuTLSKeyFile /etc/letsencrypt/live/$domain/privkey.pem
-            # See http://www.outoforder.cc/projects/httpd/mod_gnutls/docs/#GnuTLSPriorities
-            GnuTLSPriorities NORMAL:-VERS-SSL3.0:-VERS-TLS1.0:-VERS-TLS1.1
-        </VirtualHost>
-    </IfModule>
-
     # mod_ssl default options. See /etc/apache2/sites-available/default-ssl.conf
     <IfModule mod_ssl.c>
         <VirtualHost _default_:443>
diff --git a/data/etc/apache2/sites-available/plinth-ssl.conf b/data/etc/apache2/sites-available/plinth-ssl.conf
index 0b8a9a627..a7831936c 100644
--- a/data/etc/apache2/sites-available/plinth-ssl.conf
+++ b/data/etc/apache2/sites-available/plinth-ssl.conf
@@ -6,7 +6,7 @@
 ##
 ## Requires the following Apache modules to be enabled:
 ##   mod_rewrite
-##   mod_ssl or mod_gnutls
+##   mod_ssl
 ##
 <Location /plinth>
     RewriteEngine on