From: Michael Wallner Date: Mon, 25 Mar 2019 13:07:24 +0000 (+0100) Subject: etc/apache2.conf: macro update X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=a18e6ab6e293cd6258e90b9cb82298966a1a7701;p=m6w6%2Fm6w6.name etc/apache2.conf: macro update --- 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 @@ - - Use m6w6_host_defs - - Define NO_SSL_REDIRECT - - - RedirectPermanent / https://m6w6.name/ - - Use m6w6_host_defs - RedirectPermanent / https://m6w6.name/ + Use ssl_redirect - - - 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 - - - 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 - - + + Use m6w6_host_defs + Use ssl_defs "m6w6.name" "hsts_nosub" + # vim: syntax=apache ts=4 sw=4 sts=4 sr noet