[npm js.org] Split npm js.com

MB · MB · commit ce42a4f37174 · 2015-03-16T15:00:00.000Z
diff --git a/src/chrome/content/rules/Joyent.xml b/src/chrome/content/rules/Joyent.xml
@@ -6,6 +6,7 @@ Fetch error: http://www.no.de/ => https://no.de/: (28, 'Connection timed out aft
 
 		- Nodejs.org.xml
 		- Npm.im.xml
+		- Npm_js.com.xml
 		- Npm_js.org.xml
 
 
diff --git a/src/chrome/content/rules/Npm_js.com.xml b/src/chrome/content/rules/Npm_js.com.xml
@@ -0,0 +1,38 @@
+<!--
+	For other Joyent coverage, see Joyent.xml.
+
+
+	Problematic domains:
+
+		- npmjs.com ¹
+		- www.npmjs.com ²
+
+	¹ 404; self-signed, CN: Isaac Z. Schlueter
+	² Squarespace
+
+
+	Fully covered domains:
+
+		- preview.npmjs.com
+
+-->
+<ruleset name="npm js.com (partial)">
+
+	<!--	Direct rewrites:
+				-->
+	<target host="preview.npmjs.com" />
+
+
+	<!--	Not secured by server:
+					-->
+	<!--securecookie host="\.npmjs\.com$" name="^SS_MID$" /-->
+	<!--securecookie host="^preview\.npmjs\.com$" name="^crumb$" /-->
+	<!--securecookie host="^www\.npmjs\.com$" name="^(JSESSIONID|crumb)$" /-->
+
+	<securecookie host="^preview\.npmjs\.com$" name=".+" />
+
+
+	<rule from="^http:"
+		to="https:" />
+
+</ruleset>
diff --git a/src/chrome/content/rules/Npm_js.org.xml b/src/chrome/content/rules/Npm_js.org.xml
@@ -11,24 +11,18 @@
 
 	Problematic domains:
 
-		- npmjs.com ¹
-		- www.npmjs.com ²
-
 		- npmjs.org subdomains:
 
 			- couch *
 			- scratch *
 			- status ⁵
 
-	¹ 404; self-signed, CN: Isaac Z. Schlueter
-	² Squarespace
 	* Works; mismatched, CN: registry.npmjs.org
 	⁵ StatusPage
 
 
 	Fully covered domains:
 
-		- preview.npmjs.com
 		- registry.npmjs.org
 		- status.npmjs.org	(-> npmjs.statuspage.io)
 
@@ -37,8 +31,6 @@
 
 	<!--	Direct rewrites:
 				-->
-	<target host="preview.npmjs.com" />
-
 	<target host="npmjs.org" />
 	<target host="registry.npmjs.org" />
 	<target host="www.npmjs.org" />
@@ -48,13 +40,6 @@
 	<target host="status.npmjs.org" />
 
 
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="\.npmjs\.com$" name="^SS_MID$" /-->
-	<!--securecookie host="^preview\.npmjs\.com$" name="^crumb$" /-->
-	<!--securecookie host="^www\.npmjs\.com$" name="^(JSESSIONID|crumb)$" /-->
-
-	<securecookie host="^preview\.npmjs\.com$" name=".+" />
 	<securecookie host="^npmjs\.org$" name=".+" />
 
 
