From 2212d30ac3de21c94d316342da83b8bc4c01420f Mon Sep 17 00:00:00 2001
From: Michael Wallner <root@s201809.m6w6.name>
Date: Mon, 25 Mar 2019 14:05:00 +0100
Subject: [PATCH] macro update

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

diff --git a/etc/apache2.conf b/etc/apache2.conf
index db864b7..381d46e 100644
--- a/etc/apache2.conf
+++ b/etc/apache2.conf
@@ -23,17 +23,12 @@
 
 <VirtualHost *:80>
 	Use pharext_host_defs
-	Redirect permanent / https://pharext.org/
+	Use ssl_redirect
+</VirtualHost>
+
+<VirtualHost *:443>
+	Use pharext_host_defs
+	Use ssl_defs "pharext.org" "hsts"
 </VirtualHost>
 
-<IfModule ssl_module>
-	<VirtualHost *:443>
-		Use pharext_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