Exempt wikibase redirects from being rewritten to wiki pages

[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 913fc9acc52b8da27bcc28cfb2dabfbe892016be..7aba9752b87d91e5850f0b19b4e0491814b66ed6 100644 (file)
--- a/cookbooks/mediawiki/templates/default/apache.erb
+++ b/cookbooks/mediawiki/templates/default/apache.erb
@@ -32,9 +32,9 @@
 
   DocumentRoot <%= @directory %>
 
-  php_admin_value open_basedir <%= @directory %>/:/usr/share/php/:/tmp/
+  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 128M
+  php_value memory_limit 500M
   php_value max_execution_time 240
   php_value upload_max_filesize 70M
   php_value post_max_size 100M
@@ -52,6 +52,26 @@
   RedirectMatch 301 ^/api\.php$                   /w/api.php
   RedirectMatch 301 ^/opensearch_desc\.php$       /w/opensearch_desc.php
 
+  #Support Wikidata redirects based on Wikimedia's redirects:
+  # https://github.com/wikimedia/puppet/blob/production/modules/mediawiki/files/apache/sites/wikidata-uris.incl
+  RedirectMatch 301 ^/entity/statement/([QqPp]\d+).*$        /wiki/Special:EntityData/$1
+  RedirectMatch 301 ^/value/(.*)$                            /wiki/Special:ListDatatypes
+  RedirectMatch 301 ^/reference/(.*)$                        https://wikidata.org/wiki/Help:Sources
+  RedirectMatch 301 ^/prop/direct/(.*)$                      /wiki/Property:$1
+  RedirectMatch 301 ^/prop/direct-normalized/(.*)$           /wiki/Property:$1
+  RedirectMatch 301 ^/prop/novalue/(.*)$                     /wiki/Property:$1
+  RedirectMatch 301 ^/prop/statement/value/(.*)$             /wiki/Property:$1
+  RedirectMatch 301 ^/prop/statement/value-normalized/(.*)$  /wiki/Property:$1
+  RedirectMatch 301 ^/prop/qualifier/value/(.*)$             /wiki/Property:$1
+  RedirectMatch 301 ^/prop/qualifier/value-normalized/(.*)$  /wiki/Property:$1
+  RedirectMatch 301 ^/prop/reference/value/(.*)$             /wiki/Property:$1
+  RedirectMatch 301 ^/prop/reference/value-normalized/(.*)$  /wiki/Property:$1
+  RedirectMatch 301 ^/prop/statement/(.*)$                   /wiki/Property:$1
+  RedirectMatch 301 ^/prop/qualifier/(.*)$                   /wiki/Property:$1
+  RedirectMatch 301 ^/prop/reference/(.*)$                   /wiki/Property:$1
+  RedirectMatch 301 ^/prop/(.*)$                             /wiki/Property:$1
+  RedirectMatch 301 ^/entity/(.*)$                           /wiki/Special:EntityData/$1
+
   Alias /wiki <%= @directory %>/w/index.php
 
   #Support /pagename -> /wiki/pagename
@@ -63,6 +83,10 @@
   RewriteCond %{REQUEST_URI} !^/images/
   RewriteCond %{REQUEST_URI} !^/api\.php$
   RewriteCond %{REQUEST_URI} !^/opensearch_desc\.php$
+  RewriteCond %{REQUEST_URI} !^/entity/
+  RewriteCond %{REQUEST_URI} !^/value/
+  RewriteCond %{REQUEST_URI} !^/reference/
+  RewriteCond %{REQUEST_URI} !^/prop/  
   RewriteCond %{REQUEST_URI} !^/server-status
   RewriteCond %{REQUEST_URI} !^/.well-known/
   RewriteCond %{LA-U:REQUEST_FILENAME} !-f
@@ -80,7 +104,7 @@
     Options -ExecCGI -Includes -Indexes
     AllowOverride None
     AddType text/plain .html .htm .shtml
-<% if @private -%>
+<% if @private_site -%>
     Require all denied
 <% end -%>
   </Directory>