X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fm6w6.name;a=blobdiff_plain;f=etc%2Fapache2.conf;h=bf9784b0f98e095f4567437fbdfce30b0662dc88;hp=c9cf3f82c936f565224cb4a635a68882397c26ac;hb=HEAD;hpb=349860f597f9038289c7528a255c140c8b3bc418

diff --git a/etc/apache2.conf b/etc/apache2.conf
index c9cf3f8..bf9784b 100644
--- 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