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

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

diff --git a/etc/apache2.conf b/etc/apache2.conf
index dbb2a40..93b722e 100644
--- a/etc/apache2.conf
+++ b/etc/apache2.conf
@@ -22,17 +22,12 @@
 
 <VirtualHost *:80>
 	Use replicator_host_defs
-	Redirect permanent / https://replicator.pharext.org/
+	Use ssl_redirect
+</VirtualHost>
+
+<VirtualHost *:443>
+	Use replicator_host_defs
+	Use ssl_defs "pharext.org" "hsts"
 </VirtualHost>
 
-<IfModule ssl_module>
-	<VirtualHost *:443>
-		Use replicator_host_defs
-		Include "bits/hsts"
-		SSLEngine on
-		SSLUseStapling on
-		SSLCertificateKeyFile /etc/letsencrypt/live/pharext.org/privkey.pem
-		SSLCertificateFile /etc/letsencrypt/live/pharext.org/fullchain.pem
-	</VirtualHost>
-</IfModule>
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet
-- 
2.30.2