Add authentication results header for email from external hosts

[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 e84f1e35b5e1e3b69873c4def075a1f1af20d0bf..82942001bb4b580a5ff4e6527811d71b4bfe2174 100644 (file)
--- a/cookbooks/forum/templates/default/apache.erb
+++ b/cookbooks/forum/templates/default/apache.erb
@@ -39,10 +39,8 @@
 
        DocumentRoot /srv/forum.openstreetmap.org/html
 
 
        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
+       ProxyFCGISetEnvIf "true" PHP_ADMIN_VALUE "open_basedir=/srv/forum.openstreetmap.org/html/:/usr/share/php/:/tmp/\ndisable_functions=exec,shell_exec,system,passthru,popen,proc_open"
+       ProxyFCGISetEnvIf "true" PHP_VALUE "upload_max_filesize=70M\npost_max_size=100M"

 </VirtualHost>
 
 <Directory /srv/forum.openstreetmap.org/html>
 </VirtualHost>
 
 <Directory /srv/forum.openstreetmap.org/html>


@@ -55,5 +53,7 @@
 </Directory>
 
 <Directory /srv/forum.openstreetmap.org/html/img>
 </Directory>
 
 <Directory /srv/forum.openstreetmap.org/html/img>

-       php_admin_flag engine off
+       <FilesMatch ".+\.ph(ar|p|tml)$">
+               SetHandler None
+       </FilesMatch>

 </Directory>
 </Directory>