Update Ars Technica related rulesets

src/chrome/content/rules/ArsTechnica.co.uk.xml

@@ -0,0 +1,11 @@
+<!--
+	For other Condé Nast coverage, see Conde-Nast.xml.
+-->
+<ruleset name="ArsTechnica.co.uk (partial)">
+	<target host="arstechnica.co.uk" />
+	<target host="www.arstechnica.co.uk" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>

src/chrome/content/rules/ArsTechnica.com.xml

@@ -0,0 +1,58 @@
+<!--
+	For other Condé Nast coverage, see Conde-Nast.xml.
+
+	Non-functional hosts
+		Couldn't connect to server:
+		- irc.arstechnica.com
+		- irc-nyc.arstechnica.com
+		- irc-sfo.arstechnica.com
+		- staging.arstechnica.com
+
+		Timeout was reached:
+		- origin.cdn.arstechnica.com
+		- live.arstechnica.com
+		- uk.live.arstechnica.com
+		- util.arstechnica.com
+
+		SSL connect error:
+		- feeds.arstechnica.com
+
+		SSL peer certificate was not OK:
+		- www.coins.arstechnica.com
+		- www.irc.arstechnica.com
+
+		Mixed content blocking (MCB) triggered:
+		- archive.arstechnica.com
+-->
+<ruleset name="ArsTechnica.com (partial)">
+	<target host="arstechnica.com" />
+	<target host="www.arstechnica.com" />
+	<target host="apps.arstechnica.com" />
+	<target host="cardboard.arstechnica.com" />
+	<target host="civis.arstechnica.com" />
+	<target host="cms.arstechnica.com" />
+	<target host="coins.arstechnica.com" />
+	<target host="dev.arstechnica.com" />
+	<target host="episteme.arstechnica.com" />
+	<target host="hq.arstechnica.com" />
+	<target host="jobs.arstechnica.com" />
+	<target host="link.arstechnica.com" />
+	<target host="m.arstechnica.com" />
+	<target host="media.arstechnica.com" />
+	<target host="origin.arstechnica.com" />
+	<target host="sstats.arstechnica.com" />
+	<target host="static.arstechnica.com" />
+		<test url="http://static.arstechnica.com/staff-directory/" />
+		<test url="http://static.arstechnica.com/store/" />
+	<target host="stats.arstechnica.com" />
+	<target host="stats2.arstechnica.com" />
+	<target host="store.arstechnica.com" />
+	<target host="video.arstechnica.com" />
+		<test url="http://video.arstechnica.com/genres/technology" />
+		<test url="http://video.arstechnica.com/watch/a-celebration-of-cassini/" />
+	<target host="write.arstechnica.com" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>

src/chrome/content/rules/ArsTechnica.net.xml

@@ -0,0 +1,14 @@
+<!--
+	For other Condé Nast coverage, see Conde-Nast.xml.
+
+	Non-functional hosts
+		SSL peer certificate was not OK:
+		- static.arstechnica.net
+-->
+<ruleset name="ArsTechnica.net (partial)">
+	<target host="cdn.arstechnica.net" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>

src/chrome/content/rules/Conde-Nast-mismatches.xml

@@ -4,7 +4,6 @@
 -->
 <ruleset name="Condé Nast (mismatches)" default_off="expired, mismatch, self-signed">
 
-	<target host="jobs.arstechnica.com" />
 	<target host="thumbnailer.thestudio.condenast.com" />
 	<!--
 		Expired.
@@ -14,18 +13,12 @@
 	<target host="blog.details.com" />
 	<target host="golfdigestschool.com" />
 	<target host="www.golfdigestschool.com" />
-	<target host="vanityfair.com" />
-	<target host="www.vanityfair.com" />
 	<target host="vf.com" />
 	<target host="www.vf.com" />
 
 
 	<securecookie host="^designcentersearch\.com$" name=".+" />
 
-
-	<rule from="^http://jobs\.arstechnica\.com/"
-		to="https://jobs.arstechnica.com/" />
-
 	<!--	Akamai.
 				-->
 	<rule from="^http://thumbnailer\.thestudio\.condenast\.com/"
@@ -40,14 +33,6 @@
 	<rule from="^http://(?:www\.)?golfdigestschool\.com/"
 		to="https://www.golfdigestschool.com/" />
 
-	<!--	Condé Nast cert matches www.vanityfair.com
-		and stag.vanityfair.com, so presumably
-		support is forthcoming.
-							-->
-	<rule from="^http://(?:www\.)?v(?:anityfair|f)\.com/"
-		to="https://www.vanityfair.com/" />
-
-	<rule from="^http://stag\.vanityfair\.com/"
-		to="https://stag.vanityfair.com/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>

src/chrome/content/rules/Conde-Nast.xml

@@ -1,24 +1,21 @@
-
 <!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://www.condenast.com/ => https://www.condenast.com/: Too many redirects while fetching 'https://www.condenast.com/'
-Fetch error: http://condenast.com/ => https://www.condenast.com/: Too many redirects while fetching 'https://www.condenast.com/'
-
 	For problematic rules, see Conde-Nast-mismatches.xml.
 
 
 	Other Condé Nast rulesets:
 
-		- Ars-Technica.xml
+		- ArsTechnica.co.uk.xml
+		- ArsTechnica.com.xml
+		- ArsTechnica.net.xml
 		- Conde_Nast.co.uk.xml
 		- Conde_Nast_Digital.com.xml
 		- Conde_Nast_Traveler.xml
 		- Conde_Nast_store.com.xml
 		- Condenet.com.xml
 		- Details.xml
-		- Golf_Digest.xml
-		- GQ.xml
 		- GQ-magazine.co.uk.xml
+		- GQ.xml
+		- Golf_Digest.xml
 		- Style.com.xml
 		- The-New-Yorker.xml
 		- Vanity-Fair.xml
@@ -49,22 +46,14 @@ Fetch error: http://condenast.com/ => https://www.condenast.com/: Too many redir
 		- www.webmonkey.com			(Akamai; 503)
 
 -->
-<ruleset name="Conde Nast.com (partial)" default_off="failed ruleset test">
+<ruleset name="Conde Nast.com (partial)">
 
-	<!--	Direct rewrites:
-				-->
-	<target host="fonts.condenast.com" />
-	<target host="www.condenast.com" />
-
-	<!--	Complications:
-				-->
 	<target host="condenast.com" />
+	<target host="www.condenast.com" />
+	<target host="fonts.condenast.com" />
 
+	<securecookie host=".+" name=".+" />
 
-	<rule from="^http://condenast\.com/"
-		to="https://www.condenast.com/" />
-
-	<rule from="^http:"
-		to="https:" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>

src/chrome/content/rules/Vanity-Fair.xml

@@ -1,30 +1,20 @@
 <!--
 	For other Conde Nast coverage, see Conde-Nast.xml.
 
+	Non-functional host:
+		Timeout:
+		- stats.vanityfair.com
 
-	CDN buckets:
-
-		- stag.vanityfair.com.edgesuite.net
-		- www.vanityfair.com.edgesuite.net
-
-
-	Nonfunctional domains:
-
-		- promotions.vf.com
-
+		Mismatched:
+		- stats2.vanityfair.com
 -->
 <ruleset name="Vanity Fair (partial)">
 
-	<target host="secure.vanityfair.com" />
-	<target host="stats2.vanityfair.com" />
-
+	<target host="vanityfair.com" />
+	<target host="www.vanityfair.com" />
+	<target host="stag.vanityfair.com" />
 
 	<securecookie host=".+" name=".+"/>
 
-
-
-	<rule from="^http://stats2\.vanityfair\.com/"
-		to="https://vanityfair-com.122.2o7.net/" />
-
 	<rule from="^http:" to="https:" />
 </ruleset>

utils/ruleset-whitelist.csv

@@ -2559,4 +2559,4 @@ e5702add6d485cbf6b018ea01bbd171656a5cb624d2ac685d7e189a373ab8812,1,1,Yourhosting
 618c143055176140e5517088535d1ca18e01aa1132adc3f546cf5f28d4f1f655,1,0,Zoho.xml
 298d6a10c5dd2b45a9b73221ad69566c8110e36acbca3a7ce0404433e7f4a636,1,0,ZONZA.tv.xml
 5e6c30a2931bd2bf241ebcbe957a2b200f6d4526b26321e77bc41c405d90c59a,0,1,Zopa.xml
-54f30ba3843ce2be5355b1259c28f6ffe7b3c9feddcbe0de95025bc506e913cf,1,0,Zulius.com.xml
+54f30ba3843ce2be5355b1259c28f6ffe7b3c9feddcbe0de95025bc506e913cf,1,0,Zulius.com.xml