From 498f3f155262a9ffd539aba91421d310359296cc Mon Sep 17 00:00:00 2001
From: Alexander Georgievskiy <galeksandrp@gmail.com>
Date: Wed, 22 Jun 2016 04:25:52 +0300
Subject: [PATCH] tuxfamily.org

---
 src/chrome/content/rules/TuxFamily.org.xml | 135 +++++++++++++--------
 1 file changed, 82 insertions(+), 53 deletions(-)

diff --git a/src/chrome/content/rules/TuxFamily.org.xml b/src/chrome/content/rules/TuxFamily.org.xml
index 1c33660f7f1d..12c272d3745c 100644
--- a/src/chrome/content/rules/TuxFamily.org.xml
+++ b/src/chrome/content/rules/TuxFamily.org.xml
@@ -1,60 +1,89 @@
 <!--
-	Nonfunctional domains:
+www.zengamer.tuxfamily.org ¹
+www.antigoone.tuxfamily.org ¹
+forum.xmoto.tuxfamily.org ¹
+wiki.xmoto.tuxfamily.org ¹
+www.flatland.tuxfamily.org ¹
+www.xcfa.tuxfamily.org ¹
+www.ivanlef0u.tuxfamily.org ¹
+www.lebottindesjeuxlinux.tuxfamily.org ¹
+www.aru2l.tuxfamily.org ¹
+www.videoporama.tuxfamily.org ¹
+www.py3exiv2.tuxfamily.org ¹
+wiki.l2tpipsecvpn.tuxfamily.org ¹
+www.popaul77.tuxfamily.org ¹
+www.phoenixsuite.tuxfamily.org ¹
+avignu.wiki.tuxfamily.org ¹
+forum.asri.edu.tuxfamily.org ¹
+fr.flightgear.tuxfamily.org ¹
+blog.indiarosepub.tuxfamily.org ¹
+www.modnpds.tuxfamily.org ¹
+eelo.lgm.tuxfamily.org ¹
+wiki.hnm.tuxfamily.org ¹
+www.mathco.tuxfamily.org ¹
+wiki.toulonux.tuxfamily.org ¹
+www.toulonux.tuxfamily.org ¹
+tuxfamily.net ¹
+www.tuxfamily.net ¹
+panel.tuxfamily.net ¹
+malibu.tuxfamily.net ¹
+armagnac.tuxfamily.net ¹
+download.tuxfamily.net ¹
+games.tuxfamily.net ³
+absinthe.tuxfamily.net ¹
+misc.tuxfamily.net ¹
+downloads.tuxfamily.net ¹
+free.downloads.tuxfamily.net ¹
+downloads.geo.tuxfamily.net ¹
+pics.glx-dock.org ³
+blenderclan.tuxfamily.org mixed content
+scoretarot.tuxfamily.org mixed content
+geotux.tuxfamily.org mixed content
+stickyvibe.tuxfamily.org mixed content
+miniupnp.tuxfamily.org mixed content
 
-		tuxfamily.net subdomains:
-
-			- download
-			- git		(times out)
-			- listengine	(cert: panel; shows panel's data)
-			- lists		(times out)
-			- projects	(cert: panel; shows panel's data)
 
+¹ mismatch
+³ timed out
 -->
-<ruleset name="TuxFamily.org" default_off="mismatch, self-signed, may need more exclusions">
-
-	<!--	Cert: web.tuxfamily.net	-->
-	<target host="anwiki.com" />
-	<target host="*.anwiki.com" />
-	<target host="glx-dock.org" />
-	<target host="www.glx-dock.org" />
-	<target host="web.tuxfamily.net" />
-	<target host="*.tuxfamily.org" />
-		<exclusion pattern="^http://(?:download|git|listengine|lists|projects)\.tuxfamily\.org/" />
-	<target host="bugs.vhffs.org" />
-
-
-	<securecookie host="^(?:.*\.)?anwiki\.com$" name=".*" />
-	<securecookie host="^glx-dock\.org$" name=".*" />
+<ruleset name="TuxFamily.org">
+	<target host="tuxfamily.org" />
+	<target host="www.tuxfamily.org" />
+	<target host="faq.tuxfamily.org" />
+	<target host="forum.tuxfamily.org" />
+	<target host="panel.tuxfamily.org" />
+	<target host="projects.tuxfamily.org" />
+	<target host="webmail.tuxfamily.org" />
+	<target host="xmoto.tuxfamily.org" />
+	<target host="vegeti.tuxfamily.org" />
+	<target host="malinuxtele.tuxfamily.org" />
+	<target host="speakeasy.tuxfamily.org" />
+	<target host="galette.tuxfamily.org" />
+	<target host="libertempo.tuxfamily.org" />
+	<target host="feeblemind.tuxfamily.org" />
+	<target host="avignu.tuxfamily.org" />
+	<target host="actux.tuxfamily.org" />
+	<target host="prefbar.tuxfamily.org" />
+	<target host="qelectrotech.tuxfamily.org" />
+	<target host="yasminoku.tuxfamily.org" />
+	<target host="gimpons.tuxfamily.org" />
+	<target host="toulonux.tuxfamily.org" />
+	<target host="piprim.tuxfamily.org" />
+	<target host="mathematix.tuxfamily.org" />
+	<target host="denissalem.tuxfamily.org" />
+	<target host="openplacos.tuxfamily.org" />
+	<target host="bbclone.tuxfamily.org" />
+	<target host="mooouette.tuxfamily.org" />
+	<target host="pride.tuxfamily.org" />
+	<target host="alasta.tuxfamily.org" />
+	<target host="lacrymosa.tuxfamily.org" />
+	<target host="hoerbuecher.tuxfamily.org" />
+	<target host="rhinote.tuxfamily.org" />
+	<target host="bioschematics.tuxfamily.org" />
+	<target host="hatari.tuxfamily.org" />
+	<target host="chino.tuxfamily.org" />
+	
 	<securecookie host="^[\w\-]+\.tuxfamily\.org$" name=".*" />
-	<securecookie host="^bugs\.vhffs\.org$" name=".*" />
-
-
-	<!--	Cert: web.tuxfamily.net	-->
-	<rule from="^http://(?:(bugs\.|doc\.|forum\.)|www\.)?anwiki\.com/"
-		to="https://$1anwki.com/" />
-
-	<!--	Ditto.	-->
-	<rule from="^http://(?:www\.)?glx-dock\.org/"
-		to="https://glx-dock.org/" />
-
-	<!--	Secure 404!	-->
-	<rule from="^http://web\.tuxfamily\.net/"
-		to="https://web.tuxfamily.net/" />
-
-	<!--	- Projects have unique subdomains
-		- Those observed present a cert for web.tuxfamily.net
-
-		- Observed & working non-project subdomains:
-
-			- faq
-			- logo
-			- panel
-				-->
-	<rule from="^http://([\w\-]+)\.tuxfamily\.org/"
-		to="https://$1.tuxfamily.org/" />
-
-	<!--	Cert: web.tuxfamily.net	-->
-	<rule from="^http://bugs\.vhffs\.org/"
-		to="https://bugs.vhffs.org/" />
 
+	<rule from="^http:" to="https:" />
 </ruleset>