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

---
 etc/apache2.conf | 33 +++++----------------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/etc/apache2.conf b/etc/apache2.conf
index ab96afa..bf9784b 100644
--- a/etc/apache2.conf
+++ b/etc/apache2.conf
@@ -11,37 +11,14 @@
 	</Directory>
 </Macro>
 
-<VirtualHost _default_:80>
-	Use m6w6_host_defs
-	<Location "/server-status">
-		Define NO_SSL_REDIRECT
-	</Location>
-	<IfDefine !NO_SSL_REDIRECT>
-		RedirectPermanent / https://m6w6.name/
-	</IfDefine>
-</VirtualHost>
 <VirtualHost *:80>
 	Use m6w6_host_defs
-	RedirectPermanent / https://m6w6.name/
+	Use ssl_redirect
 </VirtualHost>
 
-<IfModule mod_ssl.c>
-	<VirtualHost _default_:443>
-		Use m6w6_host_defs
-		Include "bits/hsts-nosub"
-		SSLEngine on
-		SSLUseStapling on
-		SSLCertificateFile /etc/letsencrypt/live/m6w6.name/fullchain.pem
-		SSLCertificateKeyFile /etc/letsencrypt/live/m6w6.name/privkey.pem
-	</VirtualHost>
-	<VirtualHost *:443>
-		Use m6w6_host_defs
-		Include "bits/hsts-nosub"
-		SSLEngine on
-		SSLUseStapling on
-		SSLCertificateFile /etc/letsencrypt/live/m6w6.name/fullchain.pem
-		SSLCertificateKeyFile /etc/letsencrypt/live/m6w6.name/privkey.pem
-	</VirtualHost>
-</IfModule>
+<VirtualHost *:443>
+	Use m6w6_host_defs
+	Use ssl_defs "m6w6.name" "hsts_nosub"
+</VirtualHost>
 
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet
-- 
2.30.2