etc/apache2.conf: macro update

[m6w6/m6w6.name] / etc / apache2.conf

diff --git a/etc/apache2.conf b/etc/apache2.conf
index c9cf3f82c936f565224cb4a635a68882397c26ac..bf9784b0f98e095f4567437fbdfce30b0662dc88 100644 (file)
--- a/etc/apache2.conf
+++ b/etc/apache2.conf
@@ -3,10 +3,9 @@
        ServerAlias www.m6w6.name
        ServerAdmin webmaster@m6w6.name
 
-       DocumentRoot /var/www/m6w6
+       DocumentRoot /var/www/m6w6/public
 
-       <Directory /var/www/m6w6>
-               Options Indexes FollowSymLinks MultiViews
+       <Directory /var/www/m6w6/public>
                AllowOverride None
                Require all granted
        </Directory>
@@ -14,18 +13,12 @@
 
 <VirtualHost *:80>
        Use m6w6_host_defs
-       RedirectPermanent / https://m6w6.name/
+       Use ssl_redirect
 </VirtualHost>
 
-<IfModule mod_ssl.c>
-       <VirtualHost *:443>
-               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
-       </VirtualHost>
-</IfModule>
+<VirtualHost *:443>
+       Use m6w6_host_defs
+       Use ssl_defs "m6w6.name" "hsts_nosub"
+</VirtualHost>
 
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet