Merge pull request EFForg#303 from xPaw/patch-1

diracdeltas · diracdeltas · commit 224da6062a00 · 2014-06-25T19:52:48.000Z
Update alliedmods.net ruleset
diff --git a/src/chrome/content/rules/AlliedMods.xml b/src/chrome/content/rules/AlliedMods.xml
@@ -1,6 +1,11 @@
-<ruleset name="AlliedModders forum">
-  <target host="forums.alliedmods.net" />
+<ruleset name="AlliedModders">
+	<target host="alliedmods.net" />
+	<target host="*.alliedmods.net" />
 
-  <securecookie host="^forums\.alliedmods\.net$" name=".*" />
-  <rule from="^http://forums\.alliedmods\.net/" to="https://forums.alliedmods.net/"/>
+	<securecookie host="^(?:.*\.)?alliedmods\.net$" name=".+" />
+
+	<rule from="^http://([^/@:\.]+)\.alliedmods\.net/"
+		to="https://$1.alliedmods.net/" />
+
+	<rule from="^http://alliedmods\.net/" to="https://alliedmods.net/" />
 </ruleset>
