etc/apache2.conf: macro update

diff --git a/etc/apache2.conf b/etc/apache2.conf
index 9b40c99818b4cefccdcde685e8781d959e11f83e..29829e65671ad5f5e41b6596748c3d5e82a4eef5 100644 (file)
--- 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