Ori.livneh has submitted this change and it was merged.
Change subject: mediawiki: remove ancient & unused static/$lang rewrite
......................................................................
mediawiki: remove ancient & unused static/$lang rewrite
Change-Id: If66b633c5a9aa4184d464e224bc97321f84c1b53
---
M modules/mediawiki/files/apache/beta/sites/main.conf
M modules/mediawiki/files/apache/beta/sites/wiktionary.conf
M modules/mediawiki/files/apache/sites/main.conf
M modules/mediawiki/files/apache/sites/wikimedia.conf
4 files changed, 1 insertion(+), 13 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/files/apache/beta/sites/main.conf
b/modules/mediawiki/files/apache/beta/sites/main.conf
index 8ec3659..a1f9654 100644
--- a/modules/mediawiki/files/apache/beta/sites/main.conf
+++ b/modules/mediawiki/files/apache/beta/sites/main.conf
@@ -75,10 +75,6 @@
RewriteCond %{HTTP_HOST} www.([a-z-]+).wikipedia.(com|net|org)
RewriteRule ^(.*)$ http://%1.wikipedia.org$1 [R=301,L]
- # static -> $lang/static
-# RewriteCond %{HTTP_HOST} ([a-z\-]+)\.wikipedia\.org
-# RewriteRule ^/static/(.*)$ /static/%1/$1
-
# moved wikistats off NFS
RewriteRule ^/wikistats(/(.*$)|$) http://stats.wikimedia.org/$2 [R=302,L]
diff --git a/modules/mediawiki/files/apache/beta/sites/wiktionary.conf
b/modules/mediawiki/files/apache/beta/sites/wiktionary.conf
index 2c81cce..b23ac46 100644
--- a/modules/mediawiki/files/apache/beta/sites/wiktionary.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wiktionary.conf
@@ -53,10 +53,6 @@
RewriteCond %{HTTP_HOST} www.([a-z-]+).wiktionary.(com|net|org)
RewriteRule ^(.*)$ http://%1.wiktionary.org$1 [R=301,L]
- # static -> $lang/static
-# RewriteCond %{HTTP_HOST} ([a-z\-]+)\.wiktionary\.org
-# RewriteRule ^/static/(.*)$ /static/%1/$1
-
# moved wikistats off NFS
RewriteRule ^/wikistats(/(.*$)|$) http://stats.wikimedia.org/$2 [R=302,L]
diff --git a/modules/mediawiki/files/apache/sites/main.conf
b/modules/mediawiki/files/apache/sites/main.conf
index a6fd708..f004583 100644
--- a/modules/mediawiki/files/apache/sites/main.conf
+++ b/modules/mediawiki/files/apache/sites/main.conf
@@ -404,10 +404,6 @@
RewriteCond %{HTTP_HOST} ^www\.([a-z-]+)\.wikipedia\.org$
RewriteRule ^(.*)$ %{ENV:RW_PROTO}://%1.wikipedia.org$1 [R=301,L]
- # static -> $lang/static
- RewriteCond %{HTTP_HOST} ([a-z\-]+)\.wikipedia\.org
- RewriteRule ^/static/(.*)$ /static/%1/$1
-
# moved wikistats off NFS
RewriteRule ^/wikistats(/(.*$)|$) %{ENV:RW_PROTO}://stats.wikimedia.org/$2
[R=302,L]
diff --git a/modules/mediawiki/files/apache/sites/wikimedia.conf
b/modules/mediawiki/files/apache/sites/wikimedia.conf
index 21a2770..c465bff 100644
--- a/modules/mediawiki/files/apache/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/sites/wikimedia.conf
@@ -55,7 +55,7 @@
</Directory>
# Cache fonts in static-current/extensions for as long as possible.
# Primarily here for UniversalLanguageSelector.
- <Directory "/srv/mediawiki/docroot/bits/static-current/extensions">
+ <Directory "/srv/mediawiki/docroot/bits/static/current/extensions">
<IfModule mod_headers.c>
<FilesMatch "\.(eot|ttf|woff|woff2)$">
Header set Cache-control "max-age=31536000"
--
To view, visit https://gerrit.wikimedia.org/r/208300
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If66b633c5a9aa4184d464e224bc97321f84c1b53
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
