Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/67395
Change subject: Rename all ACLs to match X-CS IDs
......................................................................
Rename all ACLs to match X-CS IDs
This allows automated comparison of the entries with
configuration using a script (already written).
The script has already found some errors in the current
configuartion, will be submitted in the next patch.
Change-Id: I15acaa210db3a2c4f6ca873ab2099059dd626c18
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 46 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/67395/1
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index 1e7c53c..fcbe500 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -15,7 +15,7 @@
"2620:0:861:2:7a2b:cbff:fe09:11ba"; // bast1001
}
-acl carrier_dtac {
+acl carrier_520_18 {
"1.46.0.0"/15;
"103.1.164.0"/22;
"111.84.0.0"/16;
@@ -23,7 +23,7 @@
"202.91.16.0"/21;
}
-acl carrier_orange_congo {
+acl carrier_630_86 {
"41.77.220.64"/27;
"41.77.221.64"/27;
"41.77.222.64"/27;
@@ -35,18 +35,18 @@
"203.222.206.112"/28;
}
-acl carrier_orange_botswana {
+acl carrier_652_02 {
"41.223.141.0"/24;
}
-acl carrier_hello_cambodia {
+acl carrier_456_02 {
"117.20.116.83";
"117.20.116.84"/30;
"117.20.116.88"/30;
"117.20.116.92"/31;
}
-acl carrier_celcom_malaysia {
+acl carrier_502_13 {
"183.171.0.0"/17;
"183.171.128.0"/19;
"183.171.160.0"/20;
@@ -60,7 +60,7 @@
"203.82.92.0"/22;
}
-acl carrier_dialog_sri_lanka {
+acl carrier_413_02 {
"103.2.148.0"/22;
"111.223.128.0"/18;
"122.255.52.0"/23;
@@ -75,7 +75,7 @@
"182.161.0.0"/19;
}
-acl carrier_tata {
+acl carrier_405_0 {
"10.234.0.0"/16;
"14.96.246.36";
"14.96.246.40"/30;
@@ -113,24 +113,24 @@
"219.64.175.219";
}
-acl carrier_digi {
+acl carrier_502_16 {
"115.164.0.0"/16;
"116.197.0.0"/17;
"203.92.128.185";
}
-acl carrier_orange_ivory_coast {
+acl carrier_612_03 {
"41.66.28.72"/31;
"41.66.28.94"/31;
"41.66.28.96";
}
-acl carrier_orange_uganda {
+acl carrier_641_14 {
"41.202.224.0"/19;
"197.157.0.0"/18;
}
-acl carrier_saudi_telecom {
+acl carrier_420_01 {
"84.235.72.0"/22;
"84.235.91.0"/25;
"84.235.92.0"/25;
@@ -147,11 +147,11 @@
"212.215.128.0"/17;
}
-acl carrier_orange_kenya {
+acl carrier_639_07 {
"212.49.88.0"/25;
}
-acl carrier_orange_tunisia {
+acl carrier_605_01 {
"197.26.192.0"/18;
"197.29.128.0"/17;
"197.30.0.0"/17;
@@ -159,24 +159,24 @@
"197.30.224.0"/19;
}
-acl carrier_orange_niger {
+acl carrier_614_04 {
"41.203.157.1";
"41.203.157.2";
"41.203.159.243";
}
-acl carrier_orange_cameroon {
+acl carrier_624_02 {
"41.202.192.0"/19;
"193.251.155.0"/25;
}
-acl carrier_grameenphone_bangladesh {
+acl carrier_470_01 {
"119.30.38.0"/23;
"119.30.45.0"/24;
"119.30.47.0"/24;
}
-acl carrier_safaricom_kenya {
+acl carrier_639_02 {
"41.80.0.0"/15;
"41.90.0.0"/16;
"105.160.0.0"/13;
@@ -184,11 +184,11 @@
"197.176.0.0"/13;
}
-acl carrier_telenor_montenegro {
+acl carrier_297_01 {
"79.143.96.0"/20;
}
-acl carrier_xl_indonesia {
+acl carrier_510_11 {
"112.215.63.0"/24;
"112.215.64.0"/23;
"112.215.66.0"/24;
@@ -196,7 +196,7 @@
"202.152.243.0"/24;
}
-acl carrier_vimpelcom_beeline {
+acl carrier_250_99 {
"31.13.144.2"/31;
"31.13.144.4"/30;
"31.13.144.8"/29;
@@ -272,14 +272,14 @@
"217.148.194.142";
}
-acl carrier_vimpelcom_mobilink_pakistan {
+acl carrier_410_01 {
"119.160.116.0"/22;
"119.160.125.0"/27;
"119.160.126.96"/28;
"119.160.126.128"/25;
}
-acl carrier_orange_meditel_morocco {
+acl carrier_604_00 {
"41.92.0.0"/18;
"41.92.64.0"/19;
"41.214.192.0"/18;
@@ -287,7 +287,7 @@
"197.247.0.0"/16;
}
-acl carrier_central_african_republic {
+acl carrier_623_01 {
"41.223.184.1";
"41.223.184.2"/31;
"41.223.184.148"/30;
@@ -311,12 +311,12 @@
set req.http.X-DfltPage = "/wiki/Special:ZeroRatedMobileAccess";
/* Please keep this list alphabetized by the ACL variable */
- if (client.ip ~ carrier_celcom_malaysia) {
+ if (client.ip ~ carrier_502_13) {
if (req.http.X-Subdomain == "ZERO") {
set req.http.X-Carrier = "Celcom Malaysia";
set req.http.X-CS = "502-13";
}
- } else if (client.ip ~ carrier_central_african_republic) {
+ } else if (client.ip ~ carrier_623_01) {
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") {
@@ -324,27 +324,27 @@
set req.http.X-CS = "623-01";
}
}
- } else if (client.ip ~ carrier_dialog_sri_lanka) {
+ } else if (client.ip ~ carrier_413_02) {
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";
}
}
- } else if (client.ip ~ carrier_digi) {
+ } else if (client.ip ~ carrier_502_16) {
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";
}
}
- } else if (client.ip ~ carrier_dtac) {
+ } else if (client.ip ~ carrier_520_18) {
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";
}
- } else if (client.ip ~ carrier_grameenphone_bangladesh) {
+ } else if (client.ip ~ carrier_470_01) {
set req.http.X-DfltLang = "bn";
if (req.http.X-Subdomain == "ZERO") {
if (req.http.host ~
"(^(bn)\.zero|^zero)\.([a-zA-Z0-9-]+)\.org") {
@@ -352,17 +352,17 @@
set req.http.X-CS = "470-01";
}
}
- } else if (client.ip ~ carrier_hello_cambodia) {
+ } else if (client.ip ~ carrier_456_02) {
if (req.http.X-Subdomain == "ZERO") {
set req.http.X-Carrier = "Hello Cambodia";
set req.http.X-CS = "456-02";
}
- } else if (client.ip ~ carrier_orange_botswana) {
+ } else if (client.ip ~ carrier_652_02) {
if (req.http.X-Subdomain == "M") {
set req.http.X-Carrier = "Orange Botswana";
set req.http.X-CS = "652-02";
}
- } else if (client.ip ~ carrier_orange_cameroon) {
+ } else if (client.ip ~ carrier_624_02) {
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") {
@@ -370,24 +370,24 @@
set req.http.X-CS = "624-02";
}
}
- } else if (client.ip ~ carrier_orange_congo) {
+ } else if (client.ip ~ carrier_630_86) {
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";
}
- } else if (client.ip ~ carrier_orange_ivory_coast) {
+ } else if (client.ip ~ carrier_612_03) {
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";
}
- } else if (client.ip ~ carrier_orange_kenya) {
+ } else if (client.ip ~ carrier_639_07) {
if (req.http.X-Subdomain == "M") {
set req.http.X-Carrier = "Orange Kenya";
set req.http.X-CS = "639-07";
}
- } else if (client.ip ~ carrier_orange_meditel_morocco) {
+ } else if (client.ip ~ carrier_604_00) {
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") {
@@ -395,13 +395,13 @@
set req.http.X-CS = "604-00";
}
}
- } else if (client.ip ~ carrier_orange_niger) {
+ } else if (client.ip ~ carrier_614_04) {
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";
}
- } else if (client.ip ~ carrier_orange_tunisia) {
+ } else if (client.ip ~ carrier_605_01) {
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") {
@@ -409,43 +409,43 @@
set req.http.X-CS = "605-01";
}
}
- } else if (client.ip ~ carrier_orange_uganda) {
+ } else if (client.ip ~ carrier_641_14) {
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";
}
}
- } else if (client.ip ~ carrier_saudi_telecom) {
+ } else if (client.ip ~ carrier_420_01) {
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";
}
- } else if (client.ip ~ carrier_safaricom_kenya) {
+ } else if (client.ip ~ carrier_639_02) {
set req.http.X-Carrier = "Safaricom Kenya";
set req.http.X-CS = "639-02";
- } else if (client.ip ~ carrier_tata) {
+ } else if (client.ip ~ carrier_405_0) {
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*";
}
- } else if (client.ip ~ carrier_telenor_montenegro) {
+ } else if (client.ip ~ carrier_297_01) {
set req.http.X-Carrier = "Telenor Montenegro";
set req.http.X-CS = "297-01";
- } else if (client.ip ~ carrier_vimpelcom_beeline) {
+ } else if (client.ip ~ carrier_250_99) {
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";
}
- } else if (client.ip ~ carrier_vimpelcom_mobilink_pakistan) {
+ } else if (client.ip ~ carrier_410_01) {
if (req.http.host ~
"(^(en|ur)\.(zero|m)|^(zero|m))\.([a-zA-Z0-9-]+)\.org") {
set req.http.X-Carrier = "Vimpelcom Mobilink Pakistan";
set req.http.X-CS = "410-01";
}
- } else if (client.ip ~ carrier_xl_indonesia) {
+ } else if (client.ip ~ carrier_510_11) {
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") {
--
To view, visit https://gerrit.wikimedia.org/r/67395
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I15acaa210db3a2c4f6ca873ab2099059dd626c18
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
