X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=etc%2Fapache2.conf;h=381d46e84e1e6f175f369c04cc4e7df760b77ab7;hb=8394174c00f15efa4ab367dceb0358f9fbbe1b3b;hp=5f9c3e298dc51b12289b59c5ec8528952bfd9c26;hpb=a2fd0355c40ca0c9a088c7946f23328084d59ddc;p=pharext%2Fpharext.org

diff --git a/etc/apache2.conf b/etc/apache2.conf
index 5f9c3e2..381d46e 100644
--- a/etc/apache2.conf
+++ b/etc/apache2.conf
@@ -10,25 +10,25 @@
 		AllowOverride All
 		Require all granted
 		SetEnv APP_ENVIRONMENT production
+		RemoveHandler .phar
 		<Files "*.phar">
+			SetHandler default-handler
 			ForceType application/phar
 		</Files>
+		<FilesMatch ".+\.ph(p|tml)$">
+			SetHandler "proxy:unix:/run/php/php-pharext.sock|fcgi://localhost"
+		</FilesMatch>
 	</Directory>
 </Macro>
 
 <VirtualHost *:80>
 	Use pharext_host_defs
-	Redirect permanent / https://pharext.org/
+	Use ssl_redirect
+</VirtualHost>
+
+<VirtualHost *:443>
+	Use pharext_host_defs
+	Use ssl_defs "pharext.org" "hsts"
 </VirtualHost>
 
-<IfModule ssl_module>
-	<VirtualHost *:443>
-		Use pharext_host_defs
-		Include "bits/hsts"
-		SSLEngine on
-		SSLUseStapling on
-		SSLCertificateKeyFile /etc/letsencrypt/live/pharext.org/privkey.pem
-		SSLCertificateFile /etc/letsencrypt/live/pharext.org/fullchain.pem
-	</VirtualHost>
-</IfModule>
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet