Ori.livneh has submitted this change and it was merged. Change subject: mediawiki: Apply public-wiki-rewrites.incl to www.mediawiki.org ......................................................................
mediawiki: Apply public-wiki-rewrites.incl to www.mediawiki.org Follows-up 73cd57b (added wmfstatic), 0c901c8 (created the include). Otherwise wmfstatic paths don't work. E.g. > https://www.mediawiki.org/w/resources/assets/poweredby_mediawiki_88x31.png Bug: T99096 Change-Id: I13551006f44a4a9afb8ae61da8e728e1044443f7 --- M modules/mediawiki/files/apache/sites/main.conf 1 file changed, 3 insertions(+), 9 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/modules/mediawiki/files/apache/sites/main.conf b/modules/mediawiki/files/apache/sites/main.conf index 90624a1..c23dde5 100644 --- a/modules/mediawiki/files/apache/sites/main.conf +++ b/modules/mediawiki/files/apache/sites/main.conf @@ -17,9 +17,6 @@ RewriteCond %{ENV:RW_PROTO} !=https RewriteRule . - [E=RW_PROTO:http] - # Make robots.txt editable via Mediawiki:robots.txt - RewriteRule ^/robots.txt$ /w/robots.php [L] - RewriteRule ^/upload/(.*)$ %{ENV:RW_PROTO}://upload.wikimedia.org/mediawiki/$1 [R=302] # Our FAQ @@ -36,8 +33,10 @@ # Primary wiki redirector: Alias /wiki /srv/mediawiki/docroot/mediawiki/w/index.php - RewriteRule ^/$ /w/index.php RewriteRule ^/w/$ /w/index.php + + Include "sites-enabled/api-rewrites.incl" + Include "sites-enabled/public-wiki-rewrites.incl" # UseMod compatibility URLs RewriteCond %{QUERY_STRING} ([^&;]+) @@ -48,11 +47,6 @@ RewriteRule ^/wiki\.phtml$ %{ENV:RW_PROTO}://%{SERVER_NAME}/w/index.php [R=301,L] RewriteRule ^/math/(.*) %{ENV:RW_PROTO}://upload.wikimedia.org/math/$1 [R=301] - - Include "sites-enabled/api-rewrites.incl" - - # Configurable favicon - RewriteRule ^/favicon\.ico$ /w/favicon.php [L] <Directory "/srv/mediawiki/docroot/mediawiki/w"> <IfModule mod_php5.c> -- To view, visit https://gerrit.wikimedia.org/r/271013 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I13551006f44a4a9afb8ae61da8e728e1044443f7 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: Alex Monk <kren...@gmail.com> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org> Gerrit-Reviewer: Reedy <re...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
