X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ddc380cb484e6a23ed5aa2e4f6910852a278c476..ffa01e9d1bca92732900829dd09f980bfb8e66bd:/cookbooks/mediawiki/templates/default/apache.erb diff --git a/cookbooks/mediawiki/templates/default/apache.erb b/cookbooks/mediawiki/templates/default/apache.erb index 7aba9752b..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] @@ -87,6 +84,7 @@ RewriteCond %{REQUEST_URI} !^/value/ RewriteCond %{REQUEST_URI} !^/reference/ RewriteCond %{REQUEST_URI} !^/prop/ + RewriteCond %{REQUEST_URI} !^/dump/ RewriteCond %{REQUEST_URI} !^/server-status RewriteCond %{REQUEST_URI} !^/.well-known/ RewriteCond %{LA-U:REQUEST_FILENAME} !-f @@ -96,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/> @@ -141,7 +144,17 @@ Options -ExecCGI -Includes -Indexes AllowOverride None AddType text/plain .html .htm .shtml - php_admin_flag engine off + + SetHandler None + + + + /dump/> + Options Indexes FollowSymLinks MultiViews + AllowOverride All + IndexIgnore .ht* . robots.txt HEADER.html HEADER.cgi logo.png style.css + IndexOptions FancyIndexing FoldersFirst NameWidth=* TrackModified + IndexOrderDefault Descending Date