Merge remote-tracking branch 'github/pull/451'

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

diff --git a/cookbooks/mediawiki/templates/default/apache.erb b/cookbooks/mediawiki/templates/default/apache.erb
index d5485a6204bb46b713cced32ad4b66c18486ad3d..3182f8d587840c42391fec91afebe1f2d14cada9 100644 (file)
--- a/cookbooks/mediawiki/templates/default/apache.erb
+++ b/cookbooks/mediawiki/templates/default/apache.erb
@@ -32,12 +32,7 @@
 
   DocumentRoot <%= @directory %>
 
 
   DocumentRoot <%= @directory %>
 

-  php_admin_value open_basedir <%= @directory %>/:/usr/share/php/:/dev/null:/tmp/
-  #php_admin_value disable_functions "exec,shell_exec,system,passthru,popen,proc_open"
-  php_value memory_limit 500M
-  php_value max_execution_time 240
-  php_value upload_max_filesize 70M
-  php_value post_max_size 100M
+  ProxyTimeout 300

 
   RewriteCond %{SERVER_NAME} !=<%= @name %>
   RewriteRule ^/(.*)$ https://<%= @name %>/$1 [R=permanent]
 
   RewriteCond %{SERVER_NAME} !=<%= @name %>
   RewriteRule ^/(.*)$ https://<%= @name %>/$1 [R=permanent]


@@ -97,17 +92,22 @@
   <Directory <%= @directory %>>
     Options -Indexes
     Require all granted
   <Directory <%= @directory %>>
     Options -Indexes
     Require all granted

+
+    <FilesMatch ".+\.ph(ar|p|tml)$">
+      SetHandler "proxy:unix:/run/php/<%= @name %>.sock|fcgi://127.0.0.1"
+    </FilesMatch>

   </Directory>
 
   <Directory <%= @directory %>/w/images/>
   </Directory>
 
   <Directory <%= @directory %>/w/images/>

-    # No php execution in the upload area
-    php_admin_flag engine off

     Options -ExecCGI -Includes -Indexes
     AllowOverride None
     AddType text/plain .html .htm .shtml
 <% if @private_site -%>
     Require all denied
 <% end -%>
     Options -ExecCGI -Includes -Indexes
     AllowOverride None
     AddType text/plain .html .htm .shtml
 <% if @private_site -%>
     Require all denied
 <% end -%>

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

   </Directory>
 
   <Directory <%= @directory %>/w/images/thumb/>
   </Directory>
 
   <Directory <%= @directory %>/w/images/thumb/>


@@ -142,7 +142,9 @@
     Options -ExecCGI -Includes -Indexes
     AllowOverride None
     AddType text/plain .html .htm .shtml
     Options -ExecCGI -Includes -Indexes
     AllowOverride None
     AddType text/plain .html .htm .shtml

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

   </Directory>
 
   <Directory <%= @directory %>/dump/>
   </Directory>
 
   <Directory <%= @directory %>/dump/>