Batch trivialize unnecessary amazonaws.com rewrites (EFForg#16000)

Chan Chak Shing · Bisaloo · commit 9c87b865049b · 2018-07-17T15:32:07.000+02:00
diff --git a/src/chrome/content/rules/Adbooth.net.xml b/src/chrome/content/rules/Adbooth.net.xml
@@ -38,7 +38,7 @@
 
 
 	<rule from="^http://cdn\.adbooth\.net/"
-		to="https://s3.amazonaws.com/cdn.adbooth.net/" />
+		to="https://cdn.adbooth.net/" />
 
 	<rule from="^http://help\.adbooth\.net/track\.gif"
 		to="https://cdn.uservoice.com/track.gif" />
diff --git a/src/chrome/content/rules/Couchbase.xml b/src/chrome/content/rules/Couchbase.xml
@@ -39,6 +39,6 @@ Fetch error: http://couchbase.com/ => https://couchbase.com/: Cycle detected - U
 		to="https://na-a.marketo.com/" />
 
 	<rule from="^http://packages\.couchbase\.com/"
-		to="https://s3.amazonaws.com/packages.couchbase.com/" />
+		to="https://packages.couchbase.com/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Fine_Art_America.xml b/src/chrome/content/rules/Fine_Art_America.xml
@@ -55,10 +55,6 @@
 	<securecookie host="^\." name="^__utm" />
 	<securecookie host="^\w" name=".+" />
 
-
-	<rule from="^http://images\.fineartamerica\.com/"
-		to="https://s3.amazonaws.com/images.fineartamerica.com/" />
-
 	<rule from="^http://(?:imageslocal|render)\.fineartamerica\.com/"
 		to="https://fineartamerica.com/" />
 
diff --git a/src/chrome/content/rules/Freshdesk.xml b/src/chrome/content/rules/Freshdesk.xml
@@ -23,7 +23,7 @@
 
 
 	<rule from="^http://assets\.freshdesk\.com/"
-		to="https://s3.amazonaws.com/assets.freshdesk.com/" />
+		to="https://assets.freshdesk.com/" />
 
 	<rule from="^http://cdn\.freshdesk\.com/"
 		to="https://s3.amazonaws.com/cdn.freshdesk.com/" />
diff --git a/src/chrome/content/rules/FrostWire.xml b/src/chrome/content/rules/FrostWire.xml
@@ -2,7 +2,6 @@
 
 	<target host="static.frostwire.com"/>
 
-	<rule from="^http://static\.frostwire\.com/"
-		to="https://s3.amazonaws.com/static.frostwire.com/"/>
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/GetGlue.xml b/src/chrome/content/rules/GetGlue.xml
@@ -19,6 +19,6 @@ Fetch error: http://getglue.com/ => https://getglue.com/: (51, "SSL: no alternat
 		to="https://$1getglue.com/" />
 
 	<rule from="^http://widgets\.getglue\.com/"
-		to="https://s3.amazonaws.com/widgets.getglue.com/" />
+		to="https://widgets.getglue.com/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/HubSpot.com.xml b/src/chrome/content/rules/HubSpot.com.xml
@@ -46,18 +46,13 @@
 	<target host="no-cache.hubspot.com" />
 	<target host="offers.hubspot.com" />
 	<target host="product.hubspot.com" />
-	<target host="sites-auth.hubspot.com" />
 	<target host="static.hubspot.com" />
 	<target host="static2cdn.hubspot.com" />
 	<target host="track.hubspot.com" />
 	<target host="tracking.hubspot.com" />
 
 	<securecookie host=".+" name=".+" />
 
-	<rule from="^http://cdn1\.hubspot\.com/"
-		to="https://s3.amazonaws.com/cdn1.hubspot.com/" />
-
-	<rule from="^http:"
-		to="https:" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Huffington-Post.xml b/src/chrome/content/rules/Huffington-Post.xml
@@ -120,7 +120,7 @@
 
 
 	<rule from="^http://big\.assets\.huffingtonpost\.com/"
-		to="https://s3.amazonaws.com/big.assets.huffingtonpost.com/" />
+		to="https://big.assets.huffingtonpost.com/" />
 
 	<rule from="^http://images\.huffingtonpost\.com/"
 		to="https://s-i.huffpost.com/" />
diff --git a/src/chrome/content/rules/Pardot.xml b/src/chrome/content/rules/Pardot.xml
@@ -86,9 +86,6 @@ Fetch error: http://help.pardot.com/ => https://help.pardot.com/: (51, "SSL: no
 	<rule from="^http://(?:form-)?cdn\.pardot\.com/"
 		to="https://pi.pardot.com/" />
 
-	<rule from="^http://storage\.pardot\.com/"
-		to="https://s3.amazonaws.com/storage.pardot.com/" />
-
 	<rule from="^http://www-cdn\d?\.pardot\.com/"
 		to="https://www.pardot.com/" />
 
diff --git a/src/chrome/content/rules/PepperJam_Exchange.xml b/src/chrome/content/rules/PepperJam_Exchange.xml
@@ -25,6 +25,6 @@
 		to="https://$1pepperjamnetwork.com/" />
 
 	<rule from="^http://media\.pepperjamnetwork\.com/"
-		to="https://s3.amazonaws.com/media.pepperjamnetwork.com/" />
+		to="https://media.pepperjamnetwork.com/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/PolitiFact.xml b/src/chrome/content/rules/PolitiFact.xml
@@ -22,6 +22,6 @@
 		to="https://stpetersburgtimes.122.2o7.net/" />
 
 	<rule from="^http://static\.politifact\.com/"
-		to="https://s3.amazonaws.com/static.politifact.com/" />
+		to="https://static.politifact.com/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/SB-Nation.xml b/src/chrome/content/rules/SB-Nation.xml
@@ -45,10 +45,6 @@
 		-->
 	<securecookie host="^www\.sbnation\.com$" name=".+" />
 
-	<rule from="^http://assets\.sbnation\.com/"
-		to="https://s3.amazonaws.com/assets.sbnation.com/" />
-
-	<rule from="^http:"
-		to="https:" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/TranslateThi.is.xml b/src/chrome/content/rules/TranslateThi.is.xml
@@ -18,7 +18,6 @@ Non-2xx HTTP code: http://x.translateth.is/ (200) => https://s3.amazonaws.com/x.
 	<target host="x.translateth.is" />
 
 
-	<rule from="^http://x\.translateth\.is/"
-		to="https://s3.amazonaws.com/x.translateth.is/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Velvet_Cache.org.xml b/src/chrome/content/rules/Velvet_Cache.org.xml
@@ -12,7 +12,6 @@
 	<target host="static.velvetcache.org" />
 
 
-	<rule from="^http://static\.velvetcache\.org/"
-		to="https://s3.amazonaws.com/static.velvetcache.org/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Vzaar.xml b/src/chrome/content/rules/Vzaar.xml
@@ -38,10 +38,6 @@ Fetch error: http://mtoza.vzaar.com/ => https://mtoza.vzaar.com/: (6, 'Could not
 	<securecookie host="^view\.vzaar\.com$" name=".+" />
 
 
-	<rule from="^http://static\.vzaar\.com/"
-		to="https://s3.amazonaws.com/static.vzaar.com/" />
-
-	<rule from="^http:"
-		to="https:" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/nlx.org.xml b/src/chrome/content/rules/nlx.org.xml
@@ -53,7 +53,7 @@
 		<test url="http://png.nlx.org/content_ms/files/facebook.png" />
 
 	<rule from="^http://de\.nlx\.org/"
-		to="https://s3.amazonaws.com/de.nlx.org/" />
+		to="https://de.nlx.org/" />
 
 		<test url="http://de.nlx.org/logos/nlx-de-tag.gif" />
 
diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv
@@ -61,7 +61,7 @@ fc7c90d849f4bb81243211a9562b2c2b9a56cd5bbbdfe376a1c891c0c3fce0e2,1,1,0,Activisio
 07f5d75d4bb24e06bad963d545c2685ba90ed6b75bbb747d15734146fbc71666,1,1,0,Ad4Game.xml
 fb0ca273f18259e6a3a5fa830d5935ac5031be61d471a2cc0c6aeecdaea13698,1,1,0,Adallom.com.xml
 c781e81a341599aecb674a36f114512b59f5f7930fc309097a456c71e28db902,1,1,0,Adaptavist.com.xml
-79ecbb418c39e3d0dd20ddb11402b52c352a8a4285754d2decdabe3d9239e8fe,1,1,0,Adbooth.net.xml
+fed8a5934be4d65b1cd705d73f435794b28e646c2e6aef72cca8642a451bd155,1,0,0,Adbooth.net.xml
 58bab8c45b010c8e4f1b26a3752150319cc93fba598aeb28997ea551164b68e5,1,1,0,AdButler.xml
 6c704e7633a84752e7d46297f9077c027c9507dfc3ccdbcdd65612c44fdbfcaf,1,1,0,Addison.com.hk.xml
 7e07fe570f87f45fad1782566e2b13d2990371f8e62d275445705160b998007a,1,1,0,Addison_Lee.xml
@@ -714,7 +714,7 @@ d7baeaa6bec397bdc80535854950e1df5da6e87e37f1d852df3fab12c5764f42,1,1,0,CoreMotiv
 96a1e4d8a7a151bf30f2ce5bdbcb762f5322add6297e6a17c1d26ede3953146a,1,1,0,COSMOS_magazine.xml
 d1698155b22b3b7f5f0ca643cea078451d79ab6779f6f261d8ca54805b3db3e9,0,1,0,Costco.xml
 2468f6840c6141631608ec3bf75e9fb94e1704cfd757a0f331ef2d89376cf59e,1,1,0,Cotera.xml
-14f57a9f712732f4a7d072faea9dd8debb34ac651083459dadd90d2f7b611d3f,1,1,0,Couchbase.xml
+80eef43f077304055293c67afa215fccefe31871fe3a6712dd42fcc35c20857e,1,0,0,Couchbase.xml
 51e4dfd5e80d3187c34dbae64ea978a12df199da807108618c0db357d608742f,1,1,0,CouncilofAustralianGovernments.xml
 f66c96d6bf5531963d61883ead19002adca60f493e55c25a7636cba436b79918,1,1,0,Council_of_Europe.xml
 559b645ee0a32f92fa47772553993a3e839dba0b30267610ac4dd967c96d0fa1,1,1,0,Council_on_Foreign_Relations.xml
@@ -1202,7 +1202,7 @@ d0da63b8cfb124503218f5d2fc8e2f6de394eec88e65d7f44dc5b9e346f235ae,1,1,0,Freelansi
 cf851867f58cb76f64fdcdc2204f3c7d25f19485183165c810abe31a5ed0e77d,0,1,0,FreeWheel-problematic.xml
 ca17252eb72c6f0b2056e8e4af0f2adfa73302c3c21aa229200a7abc19b14e35,0,1,0,Freight_Calculator_Australia.xml
 66d7ab2943eba6c35563a87d17ad66b850b5ca1c7fc354f3df7271d33eecaade,1,1,0,FreshBooks.xml
-be60c615333e182ce3979e404ab1fe04d9f73a1c60259c59f1daed9cf520dec0,1,1,0,Freshdesk.xml
+26494fd72a6b4139c50d53b96950f667a933d498e41fd4dd83b444bbf87d27cc,1,0,0,Freshdesk.xml
 261de79a38338955d2dc593db32764dd61a0b73fd196a3255b89239fa4b569c6,0,1,0,Freshmilk.de.xml
 b4b923a800b65263a42c953b35b397142e56767dcd84a89a77b2888ac9845053,1,1,0,Freshmilk.tv.xml
 1bc4e86cbfde644d76b06a2d42e53d2d3ad77aa44357b51fc3cda52cc13398f2,0,1,0,FriBID.se.xml
@@ -1270,7 +1270,7 @@ ef42dcaec37676c59c30cdec3be63707681e45be25541e713cd6e97f789b4110,1,1,0,General-E
 902dd3bf0a3c6f3f594fac3abc660020512b61b0264a9766edb6701cb0d593dc,1,0,0,German-Academic-Exchange-Service.xml
 5832e8eb6587f76dab2b5c1757c83dd84685b6abbbda41e2908c18b0ece70541,1,1,0,GetChute.xml
 c0f3f31c0b90e1f5915a5700a29f250f34cb67060b0c8a32ca50c2f5c23c30d8,1,1,0,Getclicky.xml
-4cbecbcb6231060cbbb5c37e41e69291b60e45a245e6813cb5f5894de780af11,1,1,0,GetGlue.xml
+c4db3c0f59185477a2be0fe54d80f7955068f8eb4cccc4b8344d98d534d8624e,1,0,0,GetGlue.xml
 94366f38ea5c1910166134df0df239e157918cbfd3c116aae7466e0d14d0af6a,1,1,0,GetHarvest.com.xml
 60f24d3087fa3342353b77b0c57ee7af994613a5847772ee5047821942d71867,1,1,0,Get.It.xml
 10a621bf9199c08e61706800651e79887f7d9ab2eff080fe2c6cb96b6f18d664,1,1,0,GetResponse.com.xml
@@ -2457,7 +2457,7 @@ a130c2186838ac25cf952bcc67cca009371321b3acbe4fc721309b72aad7027c,0,1,0,Pegelf.de
 d32196850dffa1814571345636359745e555a8ccd3ca87b50a1ef380380292ed,1,0,0,Penton_Media.xml
 c701f76f6f266e844c32dc5290854d98e913ea2c5006495b203d27a915336213,0,1,0,People.com-problematic.xml
 166164dcf3c3d6d1e3762fbb94fecde448c60817a32fbda5dcea58510bab18a5,1,1,0,Peoples_Choice_Awards.xml
-4f739239b0b8c6773946ca4faf240e443e09ac76ea98e300f81e45be2d32bbee,1,1,0,PepperJam_Exchange.xml
+1650d0bdbdb83980d71d82b03a9fe04f044b7334fa1274f05cfecb264b9b67a7,1,0,0,PepperJam_Exchange.xml
 0bfcf99110e28c27fac8359fa56d2d15eb9a6bc51b7f19c801f48d848eaff667,0,1,0,Perfect_Market.com-problematic.xml
 7b78550930456bd1f52a35ff060fcf4bd5600361784386ac7b055825567697d1,0,1,0,Perfect_Sense_Digital.xml
 900c3a50d140a65f8eeffd335f0dfa3a879cda47460d82d990a5e3f2c74d9e2c,1,1,0,Performance-Horizon-Group.xml
@@ -2528,7 +2528,7 @@ de183d823652107d6817148ef14f0624ab67e95e1440808e1f12a41e1d52c324,1,1,0,Pogo.xml
 b18aaa63b24e4333450a6523704e29e485506972e8fc4be497e890e79ecef4bf,1,0,0,PoliceUK.xml
 ed360bd7adf7254dcf2698e30ca35858cbf4cb1e37d305ed814aa2b0781de9c7,0,1,0,Polisforbundet.se.xml
 8a694f9c1bef8cd1ce70799ac5df18b9394b1745015d1e1158f6dc8a723a7e46,0,1,0,Political_Wire.com.xml
-43181b1b84a18736b971fd4cf9fbca2035adf94aee0ae9653867e767aa753f82,1,1,0,PolitiFact.xml
+4c090da2a98d905e95ed63e20101249c8ddbef85970b29fbc8fa4f4aae9bfd9b,1,0,0,PolitiFact.xml
 fd7bac449610576bf5a1d87e2277ca130fc15ad1f557c6eb5679ca615b5ccc30,1,1,0,Polldaddy.xml
 848cbae8bb8a671970b1bd5597d466ef0342bfa39ab0ebe89e31527cda1eb383,1,1,0,Polytechnic-University-of-Catalonia.xml
 dd309ed575e2ecbc07475735c3c4f7809acaf572582657ac7537aa116ca38a91,1,0,0,polyvore.com.xml
