Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55236
Change subject: Mobile dflt redir to RU for Vimpelcom Beeline (m & zero)
......................................................................
Mobile dflt redir to RU for Vimpelcom Beeline (m & zero)
* for X-Carrier == "Vimpelcom Beeline", redirects
m.wikipedia.org -> ru.m.wikipedia.org
zero.wikipedia.org -> ru.zero.wikipedia.org
* Minor cleanup replacing spaces with tabs
* Minor spelling comment fix
Change-Id: Ib6f7bc1f5b9b5e2c8c61bc80336e7cbebceeef5e
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 19 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/36/55236/1
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 6cf97e4..9fb656f 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -58,11 +58,11 @@
"203.82.93.0"/24;
"203.82.94.0"/24;
"183.171.0.0"/18;
- "203.82.85.32"/28;
- "203.82.66.192"/28;
- "183.171.160.0"/21;
- "183.171.168.0"/21;
- "183.171.176.0"/22;
+ "203.82.85.32"/28;
+ "203.82.66.192"/28;
+ "183.171.160.0"/21;
+ "183.171.168.0"/21;
+ "183.171.176.0"/22;
}
acl carrier_dialog_sri_lanka {
@@ -229,18 +229,18 @@
}
acl carrier_xl_indonesia {
- "112.215.63.0"/24;
- "112.215.64.0"/24;
- "112.215.65.0"/24;
- "112.215.66.0"/24;
- "202.152.240.0"/24;
- "202.152.243.0"/24;
+ "112.215.63.0"/24;
+ "112.215.64.0"/24;
+ "112.215.65.0"/24;
+ "112.215.66.0"/24;
+ "202.152.240.0"/24;
+ "202.152.243.0"/24;
}
acl carrier_vimpelcom_beeline {
- /* Testing range */
- "83.220.236.0"/22;
- "217.118.66.143";
+ /* Testing range */
+ "83.220.236.0"/22;
+ "217.118.66.143";
}
# for test.* routing, FIXME
@@ -360,7 +360,7 @@
}
}
- /* once actuall in prod, ensure users can't make requests
+ /* once actually in prod, ensure users can't make requests
with a fake X-Carrier header */
/* else {
unset req.http.X-Carrier;
@@ -551,6 +551,8 @@
error 666 "http://bn.zero.wikipedia.org";;
} else if ( req.http.X-Carrier == "Saudi Telecom" ) {
error 666
"http://ar.m.wikipedia.org/wiki/%D8%AE%D8%A7%D8%B5:ZeroRatedMobileAccess";;
+ } else if ( req.http.X-Carrier == "Vimpelcom Beeline" ) {
+ error 666
"http://ru.m.wikipedia.org/wiki/%D0%A1%D0%BB%D1%83%D0%B6%D0%B5%D0%B1%D0%BD%D0%B0%D1%8F:ZeroRatedMobileAccess";;
} else {
error 666 "http://en.m.wikipedia.org"; + req.url;
}
@@ -571,6 +573,8 @@
error 666
"http://th.zero.wikipedia.org/wiki/%E0%B8%9E%E0%B8%B4%E0%B9%80%E0%B8%A8%E0%B8%A9:ZeroRatedMobileAccess";;
} else if ( req.http.X-Carrier == "Dialog Sri Lanka" ) {
error 666
"http://en.zero.wikipedia.org/wiki/Special:ZeroRatedMobileAccess";;
+ } else if ( req.http.X-Carrier == "Vimpelcom Beeline" ) {
+ error 666
"http://ru.zero.wikipedia.org/wiki/%D0%A1%D0%BB%D1%83%D0%B6%D0%B5%D0%B1%D0%BD%D0%B0%D1%8F:ZeroRatedMobileAccess";;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/55236
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6f7bc1f5b9b5e2c8c61bc80336e7cbebceeef5e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
