From adf9b713b882db7290d4145e05d022be3658e2fa Mon Sep 17 00:00:00 2001
From: Michael Wallner <root@s201809.m6w6.name>
Date: Mon, 25 Mar 2019 14:06:55 +0100
Subject: [PATCH] etc/apache2.conf: macro update

---
 etc/apache2.conf | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/etc/apache2.conf b/etc/apache2.conf
index 9b40c99..29829e6 100644
--- a/etc/apache2.conf
+++ b/etc/apache2.conf
@@ -22,19 +22,12 @@
 
 <VirtualHost *:80>
 	Use mdref_host_defs
-	<IfModule ssl_module>
-		Redirect permanent / https://mdref.m6w6.name/
-	</IfModule>
+	Use ssl_redirect
+</VirtualHost>
+
+<VirtualHost *:443>
+	Use mdref_host_defs
+	Use ssl_defs "m6w6.name" "hsts_nosub"
 </VirtualHost>
 
-<IfModule ssl_module>
-	<VirtualHost *:443>
-		Use mdref_host_defs
-		Include "bits/hsts"
-		SSLEngine on
-		SSLUseStapling on
-		SSLCertificateKeyFile /etc/letsencrypt/live/m6w6.name/privkey.pem
-		SSLCertificateFile /etc/letsencrypt/live/m6w6.name/fullchain.pem
-	</VirtualHost>
-</IfModule>
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet
-- 
2.30.2