macro update

diff --git a/etc/apache2.conf b/etc/apache2.conf
index db864b77dfc9766f3c60d84f4ee0768c5d73f9c4..381d46e84e1e6f175f369c04cc4e7df760b77ab7 100644 (file)
--- 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