@@ -1,46 +1,22 @@
 <!--
-	Umeå Hackerspace
-
-
-	Fully covered hosts in *umeahackerspace.se:
-
-		- (www.)?
-		- social
-		- stuff
-		- wiki
-
-
-	Insecure cookies are set for these hosts:
-
-		- social.umeahackerspace.se
-
-
-	Mixed content:
-
-		- css on ^ from fonts.googleapis.com *
-
-	* Secured by us
-
+	Non-functional hosts
+		Peer certificate cannot be authenticated with given CA certificates:
+			 - asbest.umeahackerspace.se
+			 - gram.umeahackerspace.se
+			 - gumboda.umeahackerspace.se
 -->
-<ruleset name="Umea Hackerspace.se" platform="cacert">
-
-	<!--	Direct rewrites:
-				-->
+<ruleset name="Umea Hackerspace.se (partial)">
 	<target host="umeahackerspace.se" />
+	<target host="lists.umeahackerspace.se" />
+	<target host="music.umeahackerspace.se" />
+	<target host="musik.umeahackerspace.se" />
 	<target host="social.umeahackerspace.se" />
 	<target host="stuff.umeahackerspace.se" />
+	<target host="stuff-rw.umeahackerspace.se" />
 	<target host="wiki.umeahackerspace.se" />
-	<target host="www.umeahackerspace.se" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^social\.umeahackerspace\.se$" name="^PHPSESSID$" /-->
 
+	<securecookie host="^umeahackerspace\.se$" name=".+" />
 	<securecookie host="^social\.umeahackerspace\.se$" name=".+" />
 
-
-	<rule from="^http:"
-		to="https:" />
-
+	<rule from="^http:" to="https:" />
 </ruleset>