X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a1780627367305e7bd8987ad71fec090cda8743f..ffa01e9d1bca92732900829dd09f980bfb8e66bd:/cookbooks/mediawiki/templates/default/apache.erb diff --git a/cookbooks/mediawiki/templates/default/apache.erb b/cookbooks/mediawiki/templates/default/apache.erb index d5485a620..fd23a5341 100644 --- a/cookbooks/mediawiki/templates/default/apache.erb +++ b/cookbooks/mediawiki/templates/default/apache.erb @@ -32,12 +32,9 @@ 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 + AllowEncodedSlashes NoDecode + + ProxyTimeout 300 RewriteCond %{SERVER_NAME} !=<%= @name %> RewriteRule ^/(.*)$ https://<%= @name %>/$1 [R=permanent] @@ -97,17 +94,22 @@ > Options -Indexes Require all granted + + + SetHandler "proxy:unix:/run/php/php-<%= @name %>-fpm.sock|fcgi://127.0.0.1" + /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 -%> + + SetHandler None + /w/images/thumb/> @@ -142,7 +144,9 @@ Options -ExecCGI -Includes -Indexes AllowOverride None AddType text/plain .html .htm .shtml - php_admin_flag engine off + + SetHandler None + /dump/>