Name php-fpm socket to work with apparmor-profiles

[chef.git] / cookbooks / forum / templates / default / apache.erb

diff --git a/cookbooks/forum/templates/default/apache.erb b/cookbooks/forum/templates/default/apache.erb
index 9150356596f1620419c09665ed42a46800800115..5235ee1f8378ed57298626f62c8be9c26e4b541e 100644 (file)
--- a/cookbooks/forum/templates/default/apache.erb
+++ b/cookbooks/forum/templates/default/apache.erb
@@ -38,6 +38,10 @@
        ErrorLog /var/log/apache2/forum.openstreetmap.org-error.log
 
        DocumentRoot /srv/forum.openstreetmap.org/html
+
+       <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>
@@ -48,3 +52,9 @@
 
        Require all granted
 </Directory>
+
+<Directory /srv/forum.openstreetmap.org/html/img>
+       <FilesMatch ".+\.ph(ar|p|tml)$">
+               SetHandler None
+       </FilesMatch>
+</Directory>