From: Michael Wallner <root@s201809.m6w6.name>
Date: Mon, 25 Mar 2019 13:06:55 +0000 (+0100)
Subject: etc/apache2.conf: macro update
X-Git-Url: https://git.m6w6.name/?p=mdref%2Fmdref.m6w6.name;a=commitdiff_plain;h=adf9b713b882db7290d4145e05d022be3658e2fa

etc/apache2.conf: macro update
---

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