Merge pull request EFForg#342 from reedy/wikimedia-30062014

jsha · jsha · commit c401c43529a3 · 2014-06-30T17:00:42.000-04:00
Update Wikimedia ruleset.
diff --git a/src/chrome/content/rules/Wikimedia.xml b/src/chrome/content/rules/Wikimedia.xml
@@ -14,7 +14,7 @@
 	<target host="www.mediawiki.org" />
 	<target host="wikimedia.org" />
 	<target host="*.wikimedia.org" />
-		<exclusion pattern="^http://(?:apt|brewster|bug-attachment|cs|cz|dataset2|download|ekrem|emery|labs-ns0|labs-ns1|search|status|sitemap|torrus|ubuntu|virt0)\.wikimedia\.org" />
+		<exclusion pattern="^http://(?:apt|cs|cz|status|torrus|ubuntu)\.wikimedia\.org" />
 		<!-- https://mail1.eff.org/pipermail/https-everywhere-rules/2012-June/001189.html -->
 		<exclusion pattern="^http://lists\.wikimedia\.org/pipermail(?:$|/)" />
 	<target host="wikimediafoundation.org" />
@@ -29,7 +29,6 @@
 	<target host="*.wikinews.org" />
 	<target host="wikipedia.org" />
 	<target host="*.wikipedia.org" />
-		<exclusion pattern="^http://(?:download|static)\.wikipedia\.org/" />
 	<target host="wikiquote.org" />
 	<target host="*.wikiquote.org" />
 	<target host="wikisource.org" />
@@ -61,6 +60,15 @@
 	<rule from="^http://(?:www\.)?mediawiki\.org/"
 		to="https://www.mediawiki.org/" />
 
+	<rule from="^https?://download\.wikipedia\.org/"
+		to="https://dumps.wikimedia.org/" />
+
+	<rule from="^https?://(download|dataset2|sitemap)\.wikimedia\.org/"
+		to="https://dumps.wikimedia.org/" />
+
+	<rule from="^https?://(labs-ns[01]|virt0)\.wikimedia\.org/"
+		to="https://wikitech.wikimedia.org/" />	
+
 	<rule from="^http://([^@:/]+\.)?wik(ibooks|idata|imedia|inews|ipedia|iquote|isource|iversity|ivoyage|tionary)\.org/"
 		to="https://$1wik$2.org/" />
 
@@ -73,6 +81,6 @@
 	<rule from="^http://(www\.)?wikimedia\.ca/"
 		to="https://wikimedia.ca/" />
 
-	<rule from="^http://(tools|icinga|ganglia)\.wmflabs\.org/"
+	<rule from="^http://([^@:/]+)\.wmflabs\.org/"
 		to="https://$1.wmflabs.org/" />
 </ruleset>
