--- ./apache/sites/foundation.conf	2018-09-24 09:22:12.000000000 +0200
+++ ./apache/sites/foundation-new.conf	2018-09-24 09:21:38.000000000 +0200
@@ -1,7 +1,9 @@
 <VirtualHost *:80>
-    DocumentRoot "/srv/mediawiki/docroot/wikimediafoundation.org"
+
     ServerName foundation.wikimedia.org
+    DocumentRoot /srv/mediawiki/docroot/wikimediafoundation.org
     ServerAlias wikimediafoundation.org
+    UseCanonicalName On

     AllowEncodedSlashes On

@@ -14,31 +16,55 @@
     RewriteRule ^/fundraising(\.html)?$ %{ENV:RW_PROTO}://%{SERVER_NAME}/wiki/Fundraising [R=301,L]
     RewriteRule ^/index(\.html)?$ %{ENV:RW_PROTO}://%{SERVER_NAME}/wiki/Home [R=301,L]
     RewriteRule ^/GNU_FDL(\.html)?$ %{ENV:RW_PROTO}://%{SERVER_NAME}/wiki/GNU_Free_Documentation_License [R=301,L]
-
     # Obsolete PDF redirected to current wiki page
-    # Redirect added -- bv 2009-01-09
     RewriteRule ^/bylaws\.pdf %{ENV:RW_PROTO}://%{SERVER_NAME}/wiki/Wikimedia_Foundation_bylaws [R,L]
+    RewriteRule ^/wiki/Donate$ https://donate.wikimedia.org/ [R=301,L]
+
+    ### Common rewrite rules for all wikis
+
+    # Redirect /wiki, /w to the fcgi backend
+    ProxyPass       /wiki                fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimediafoundation.org/w/index.php retry=0
+    ProxyPass       /w/thumb_handler.php fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimediafoundation.org/w/thumb_handler.php retry=0
+    ProxyPass       /w/extensions        !
+    ProxyPassMatch  ^/w/(.*\.(php|hh))$  fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimediafoundation.org/w/$1 retry=0
+    RewriteRule     ^/$                  fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimediafoundation.org/w/index.php    [P]
+    RewriteRule     ^/robots\.txt$       fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimediafoundation.org/w/robots.php   [P]
+    RewriteRule     ^/favicon\.ico$      fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimediafoundation.org/w/favicon.php  [P]
+    # /w/wiki.phtml is severely underperforming on HHVM
+    RewriteRule     ^/w/wiki.phtml$      /w/index.php [L,QSA,NE]

     # Primary wiki redirector:
     Alias /wiki /srv/mediawiki/docroot/wikimediafoundation.org/w/index.php
-    Include "sites-enabled/public-wiki-rewrites.incl"
-    Include "sites-enabled/api-rewrites.incl"
-    Include "sites-enabled/wikimedia-legacy.incl"
+    # Make robots.txt editable via Mediawiki:robots.txt
+    RewriteRule ^/robots\.txt$ /w/robots.php [L]
+    # Primary wiki redirector:
+    RewriteRule ^/$ /w/index.php
+    # Configurable favicon
+    RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
+    # Configurable apple-touch-icon.png
+    RewriteRule ^/apple-touch-icon\.png$ /w/touch.php [L]
+
+    # Multiversion static files (T99096)
+    RewriteRule ^/w/skins/.*$ /w/static.php [PT]
+    RewriteRule ^/w/resources/.*$ /w/static.php [PT]
+    RewriteRule ^/w/extensions/.*$ /w/static.php [PT]
+
+    # Common API-related rewrites
+    # API listing
+    RewriteRule ^/api$ %{ENV:RW_PROTO}://%{SERVER_NAME}/api/ [R=301]
+    RewriteRule ^/api/$ /w/extract2.php?template=API_listing_template [L]

+    # Math compatibility mode
+    RewriteCond %{ENV:RW_PROTO} !=""
     RewriteRule ^/math/(.*) %{ENV:RW_PROTO}://upload.wikimedia.org/math/$1 [R=301]
+    RewriteRule ^/math/(.*) https://upload.wikimedia.org/math/$1 [R=301]

-    RewriteRule ^/wiki/Donate$ https://donate.wikimedia.org/ [R=301,L]
+    # UseMod compatibility URLs
+    RewriteCond %{QUERY_STRING} ([^&;]+)
+    RewriteRule ^/wiki\.cgi$ %{ENV:RW_PROTO}://%{SERVER_NAME}/w/index.php?title=%1 [R=301,L]
+    RewriteRule ^/wiki\.cgi$ %{ENV:RW_PROTO}://%{SERVER_NAME}/w/index.php [R=301,L]
+    # Early phase 2 compatibility URLs
+    RewriteRule ^/wiki\.phtml$ %{ENV:RW_PROTO}://%{SERVER_NAME}/w/index.php [R=301,L]

-    <Directory "/srv/mediawiki/docroot/wikimediafoundation.org/w">
-        <IfModule mod_php5.c>
-            php_admin_flag engine on
-        </IfModule>
-    </Directory>
-    <Directory "/srv/mediawiki/docroot/wikimediafoundation.org/w/extensions">
-        <IfModule mod_php5.c>
-            php_admin_flag engine off
-        </IfModule>
-    </Directory>
-</VirtualHost>

-# vim: syn=apache sts=4 sw=4 autoindent
+</VirtualHost>