From 8ff26974e6fced7d41412e56849c00269b61bece Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sun, 11 Oct 2020 19:40:16 +0200
Subject: ensure TLS settings are applied only when both wanted and possible

---
 apache2/conf-available/local-ssl.conf | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'apache2')

diff --git a/apache2/conf-available/local-ssl.conf b/apache2/conf-available/local-ssl.conf
index 8e30d50..7b2cabf 100644
--- a/apache2/conf-available/local-ssl.conf
+++ b/apache2/conf-available/local-ssl.conf
@@ -10,6 +10,8 @@
 	</IfDefine>
 </IfDefine>
 
+<IfDefine _TLSHOST>
+
 <If "%{HTTPS} == 'off'">
 	RedirectMatch permanent ^(?!/.well-known/)(.*) https://${_HOST}/$1
 </If>
@@ -22,6 +24,7 @@
 	</IfDefine>
 </IfModule>
 
+<IfModule mod_ssl.c>
 <IfModule !mod_gnutls.c>
 	SSLEngine on
 	<IfDefine _TLS_KEY>
@@ -36,3 +39,6 @@
 		SSLOptions +StdEnvVars
 	</Directory>
 </IfModule>
+</IfModule>
+
+</IfModule> # _TLSHOST
-- 
cgit v1.2.3