Merge pull request EFForg#4537 from galenide/improved-mediagoblindotorg-ruleset

J0WI · J0WI · commit 4bb29ec97855 · 2016-05-09T17:32:23.000+02:00
[MediaGoblin.org] Enabled ruleset, specified the issues and wiki subd…
diff --git a/src/chrome/content/rules/MediaGoblin.org.xml b/src/chrome/content/rules/MediaGoblin.org.xml
@@ -1,36 +1,28 @@
 <!--
-	- Expired 2013-03-28
-	- Cert only matches *.mediagoblin.org
+	Unsupported subdomains:
+	(Cert only matches wiki.mediagoblin.org and www.wiki.mediagoblin.org)
 
+		- (www.)	(^ → www)
+		- docs
+		- lists
+		- new
+		- status
 
 	Fully covered subdomains:
 
-		- (www.)	(^ → www)
-		- docs
 		- issues
 		- wiki
-
-
-	Mixed content:
-
-		- css on wiki from wiki *
-
-	* Secured by us
-
 -->
-<ruleset name="MediaGoblin.org" default_off="expired, self-signed">
-
-	<target host="mediagoblin.org" />
-	<target host="*.mediagoblin.org" />
+<ruleset name="MediaGoblin.org (partial)">
 
+	<target host="issues.mediagoblin.org" />
+	<target host="wiki.mediagoblin.org" />
 
-	<securecookie host="^(?:issues|wiki)\.mediagoblin\.org$" name=".+" />
 
+	<securecookie host="(^|\.)(issues|wiki)\.mediagoblin\.org$" name=".+" />
 
-	<rule from="^http://(?:www\.)?mediagoblin\.org/"
-		to="https://www.mediagoblin.org/" />
 
-	<rule from="^http://(docs|issues|wiki)\.mediagoblin\.org/"
-		to="https://$1.mediagoblin.org/" />
+	<rule from="^http:"
+		to="https:" />
 
 </ruleset>
