From: Michael Wallner Date: Sat, 9 Mar 2019 11:18:47 +0000 (+0100) Subject: update config X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=bbf67e0ed673ebab904d32559cd1ed2f306d8bf5;p=m6w6%2Fm6w6.name update config --- diff --git a/etc/apache2.conf b/etc/apache2.conf index c9cf3f8..ab96afa 100644 --- a/etc/apache2.conf +++ b/etc/apache2.conf @@ -3,21 +3,37 @@ ServerAlias www.m6w6.name ServerAdmin webmaster@m6w6.name - DocumentRoot /var/www/m6w6 + DocumentRoot /var/www/m6w6/public - - Options Indexes FollowSymLinks MultiViews + AllowOverride None Require all granted + + Use m6w6_host_defs + + Define NO_SSL_REDIRECT + + + RedirectPermanent / https://m6w6.name/ + + Use m6w6_host_defs RedirectPermanent / https://m6w6.name/ + + 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"