X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/dfbca127c61d8f5c6d69e7c9a4133880f0540456..91328d0cfafb16b6a070be1303492b04e428fe7c:/cookbooks/forum/templates/default/apache.erb

diff --git a/cookbooks/forum/templates/default/apache.erb b/cookbooks/forum/templates/default/apache.erb
index e84f1e35b..5235ee1f8 100644
--- a/cookbooks/forum/templates/default/apache.erb
+++ b/cookbooks/forum/templates/default/apache.erb
@@ -39,10 +39,9 @@
 
 	DocumentRoot /srv/forum.openstreetmap.org/html
 
-	php_admin_value open_basedir /srv/forum.openstreetmap.org/html/:/usr/share/php/:/tmp/
-	php_admin_value disable_functions "exec,shell_exec,system,passthru,popen,proc_open"
-	php_value upload_max_filesize 70M
-	php_value post_max_size 100M
+	<FilesMatch ".+\.ph(ar|p|tml)$">
+		SetHandler "proxy:unix:/run/php/php-forum.openstreetmap.org-fpm.sock|fcgi://127.0.0.1"
+	</FilesMatch>
 </VirtualHost>
 
 <Directory /srv/forum.openstreetmap.org/html>
@@ -55,5 +54,7 @@
 </Directory>
 
 <Directory /srv/forum.openstreetmap.org/html/img>
-	php_admin_flag engine off
+	<FilesMatch ".+\.ph(ar|p|tml)$">
+		SetHandler None
+	</FilesMatch>
 </Directory>