Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/66034
Change subject: Removed carrier-specific filtering
......................................................................
Removed carrier-specific filtering
Now all requests coming from the Carrier's IPs will be tagged with
the appropriate X-CS header, and the backend will decide how to handle it
Change-Id: I63c97ba129b11eacf0f0bc73f4ce0aa6ef3d8ecc
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 45 insertions(+), 102 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/34/66034/1
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index 8d367f9..2f4cde0 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -291,144 +291,87 @@
/* Please keep this list alphabetized by the ACL variable */
if (client.ip ~ carrier_celcom_malaysia) {
- if (req.http.X-Subdomain == "ZERO") {
- set req.http.X-Carrier = "Celcom Malaysia";
- set req.http.X-CS = "502-13";
- }
+ set req.http.X-Carrier = "Celcom Malaysia";
+ set req.http.X-CS = "502-13";
} else if (client.ip ~ carrier_central_african_republic) {
set req.http.X-DfltLang = "fr";
- if (req.http.X-Subdomain == "M") {
- if (req.http.host ~
"(^(fr|ar|sg|en|es|zh|ar|ha|ln|eo)\.m|^m)\.([a-zA-Z0-9-]+)\.org") {
- set req.http.X-Carrier = "Orange Central
African Republic";
- set req.http.X-CS = "623-01";
- }
- }
+ set req.http.X-Carrier = "Orange Central African Republic";
+ set req.http.X-CS = "623-01";
} else if (client.ip ~ carrier_dialog_sri_lanka) {
- if (req.http.X-Subdomain == "ZERO") {
- if (req.http.host ~
"(^(en|ta|si)\.zero|^zero)\.([a-zA-Z0-9-]+)\.org") {
- set req.http.X-Carrier = "Dialog Sri Lanka";
- set req.http.X-CS = "413-02";
- }
- }
+ set req.http.X-Carrier = "Dialog Sri Lanka";
+ set req.http.X-CS = "413-02";
} else if (client.ip ~ carrier_digi) {
- if (req.http.X-Subdomain == "ZERO") {
- if (req.http.User-Agent ~ "Opera") {
- set req.http.X-Carrier = "DIGI";
- set req.http.X-CS = "502-16";
- }
+ /* @TODO: Need to double check if it is ok to remove UA filter
here */
+ if (req.http.User-Agent ~ "Opera") {
+ set req.http.X-Carrier = "DIGI";
+ set req.http.X-CS = "502-16";
}
} else if (client.ip ~ carrier_dtac) {
set req.http.X-DfltLang = "th";
- if (req.http.X-Subdomain == "ZERO") {
- set req.http.X-Carrier = "DTAC";
- set req.http.X-CS = "520-18";
- }
+ set req.http.X-Carrier = "DTAC";
+ set req.http.X-CS = "520-18";
} else if (client.ip ~ carrier_grameenphone_bangladesh) {
set req.http.X-DfltLang = "bn";
- if (req.http.X-Subdomain == "ZERO") {
- if (req.http.host ~
"(^(bn)\.zero|^zero)\.([a-zA-Z0-9-]+)\.org") {
- set req.http.X-Carrier = "Grameenphone
Bangladesh";
- set req.http.X-CS = "470-01";
- }
- }
+ set req.http.X-Carrier = "Grameenphone Bangladesh";
+ set req.http.X-CS = "470-01";
} else if (client.ip ~ carrier_hello_cambodia) {
- if (req.http.X-Subdomain == "ZERO") {
- set req.http.X-Carrier = "Hello Cambodia";
- set req.http.X-CS = "456-02";
- }
+ set req.http.X-Carrier = "Hello Cambodia";
+ set req.http.X-CS = "456-02";
} else if (client.ip ~ carrier_orange_botswana) {
- if (req.http.X-Subdomain == "M") {
- set req.http.X-Carrier = "Orange Botswana";
- set req.http.X-CS = "652-02";
- }
+ set req.http.X-Carrier = "Orange Botswana";
+ set req.http.X-CS = "652-02";
} else if (client.ip ~ carrier_orange_cameroon) {
set req.http.X-DfltLang = "fr";
- if (req.http.X-Subdomain == "M") {
- if (req.http.host ~
"(^(fr|en|es|de|zh|ar|ha|ln|yo|eo)\.m|^m)\.([a-zA-Z0-9-]+)\.org") {
- set req.http.X-Carrier = "Orange Cameroon";
- set req.http.X-CS = "624-02";
- }
- }
+ set req.http.X-Carrier = "Orange Cameroon";
+ set req.http.X-CS = "624-02";
} else if (client.ip ~ carrier_orange_congo) {
set req.http.X-DfltLang = "fr";
- if (req.http.X-Subdomain == "M") {
- set req.http.X-Carrier = "Orange Congo";
- set req.http.X-CS = "630-86";
- }
+ set req.http.X-Carrier = "Orange Congo";
+ set req.http.X-CS = "630-86";
} else if (client.ip ~ carrier_orange_ivory_coast) {
set req.http.X-DfltLang = "fr";
- if (req.http.X-Subdomain == "M") {
- set req.http.X-Carrier = "Orange Ivory Coast";
- set req.http.X-CS = "612-03";
- }
+ set req.http.X-Carrier = "Orange Ivory Coast";
+ set req.http.X-CS = "612-03";
} else if (client.ip ~ carrier_orange_kenya) {
- if (req.http.X-Subdomain == "M") {
- set req.http.X-Carrier = "Orange Kenya";
- set req.http.X-CS = "639-07";
- }
+ set req.http.X-Carrier = "Orange Kenya";
+ set req.http.X-CS = "639-07";
} else if (client.ip ~ carrier_orange_meditel_morocco) {
set req.http.X-DfltLang = "fr";
- if (req.http.X-Subdomain == "M") {
- if (req.http.host ~
"(^(fr|ar|en|es|de|it|nl|pt|ru|zh)\.m|^m)\.([a-zA-Z0-9-]+)\.org") {
- set req.http.X-Carrier = "Orange Meditel
Morocco";
- set req.http.X-CS = "604-00";
- }
- }
+ set req.http.X-Carrier = "Orange Meditel Morocco";
+ set req.http.X-CS = "604-00";
} else if (client.ip ~ carrier_orange_niger) {
set req.http.X-DfltLang = "fr";
- if (req.http.X-Subdomain == "M") {
- set req.http.X-Carrier = "Orange Niger";
- set req.http.X-CS = "614-04";
- }
+ set req.http.X-Carrier = "Orange Niger";
+ set req.http.X-CS = "614-04";
} else if (client.ip ~ carrier_orange_tunisia) {
set req.http.X-DfltLang = "fr";
- if (req.http.X-Subdomain == "M") {
- if (req.http.host ~
"(^(ar|en|fr|es|de|it|ru|ja|zh)\.m|^m)\.([a-zA-Z0-9-]+)\.org") {
- set req.http.X-Carrier = "Orange Tunisia";
- set req.http.X-CS = "605-01";
- }
- }
+ set req.http.X-Carrier = "Orange Tunisia";
+ set req.http.X-CS = "605-01";
} else if (client.ip ~ carrier_orange_uganda) {
- if (req.http.X-Subdomain == "M") {
- if (req.http.host ~
"(^(ko|fr|de|en|zh|sw|rw|ar|hi|es)\.m|^m)\.([a-zA-Z0-9-]+)\.org") {
- set req.http.X-Carrier = "Orange Uganda";
- set req.http.X-CS = "641-14";
- }
- }
+ set req.http.X-Carrier = "Orange Uganda";
+ set req.http.X-CS = "641-14";
} else if (client.ip ~ carrier_saudi_telecom) {
set req.http.X-DfltLang = "ar";
- if (req.http.host ~
"(^(ar|bn|en|tl|ur)\.(zero|m)|^(zero|m))\.([a-zA-Z0-9-]+)\.org") {
- set req.http.X-Carrier = "Saudi Telecom";
- set req.http.X-CS = "420-01";
- }
+ set req.http.X-Carrier = "Saudi Telecom";
+ set req.http.X-CS = "420-01";
} else if (client.ip ~ carrier_tata) {
- if (req.http.X-Subdomain == "ZERO") {
- set req.http.X-Carrier = "TATA";
- /* MCC-MNC not clear from
http://en.wikipedia.org/wiki/Mobile_country_code */
- set req.http.X-CS = "405-0*";
- }
+ set req.http.X-Carrier = "TATA";
+ /* MCC-MNC not clear from
http://en.wikipedia.org/wiki/Mobile_country_code */
+ set req.http.X-CS = "405-0*";
} else if (client.ip ~ carrier_telenor_montenegro) {
set req.http.X-Carrier = "Telenor Montenegro";
set req.http.X-CS = "297-01";
} else if (client.ip ~ carrier_vimpelcom_beeline) {
set req.http.X-DfltLang = "ru";
- if (req.http.host ~
"(^(en|ru)\.(zero|m)|^(zero|m))\.([a-zA-Z0-9-]+)\.org") {
- set req.http.X-Carrier = "Vimpelcom Beeline";
- set req.http.X-CS = "250-99";
- }
+ set req.http.X-Carrier = "Vimpelcom Beeline";
+ set req.http.X-CS = "250-99";
} else if (client.ip ~ carrier_vimpelcom_mobilink_pakistan) {
- if (req.http.host ~
"(^(en)\.(zero|m)|^(zero|m))\.([a-zA-Z0-9-]+)\.org") {
- set req.http.X-Carrier = "Vimpelcom Mobilink Pakistan";
- set req.http.X-CS = "410-01";
- }
+ set req.http.X-Carrier = "Vimpelcom Mobilink Pakistan";
+ set req.http.X-CS = "410-01";
} else if (client.ip ~ carrier_xl_indonesia) {
set req.http.X-DfltLang = "id";
- if (req.http.X-Subdomain == "ZERO") {
- if (req.http.host ~
"(^(id|en|zh|ar|hi|ms|jv|su)\.zero|^zero)\.([a-zA-Z0-9-]+)\.org") {
- set req.http.X-Carrier = "XL Axiata";
- set req.http.X-CS = "510-11";
- }
- }
+ set req.http.X-Carrier = "XL Axiata";
+ set req.http.X-CS = "510-11";
}
/* Please keep the above list alphabetized by the ACL variable */
}
--
To view, visit https://gerrit.wikimedia.org/r/66034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I63c97ba129b11eacf0f0bc73f4ce0aa6ef3d8ecc
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
