From 2bcd01ab250afd1b66e3d3ea981d9fcd1580e5dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Fuglede=20J=C3=B8rgensen?= <s@fuglede.dk>
Date: Wed, 3 Aug 2016 01:41:20 +0200
Subject: [PATCH] [Archive.is] Update ruleset (#5886)

* [Archive.is] Update ruleset

After having had a couple of different issues with this ruleset, cf. in particular

    https://github.com/EFForg/https-everywhere/issues/5805 and
    https://github.com/EFForg/https-everywhere/issues/4075

I prompted the webmaster for what would be a proper solution moving forwards. On their request, this avoids redirecting anything to https://archive.is/ but ensures that the relevant connections are still upgrading by using archive.fo instead.

* [Archive.is] Update comment
---
 src/chrome/content/rules/Archive.is.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/chrome/content/rules/Archive.is.xml b/src/chrome/content/rules/Archive.is.xml
index 237a1a870083..4fb00cf8bf75 100644
--- a/src/chrome/content/rules/Archive.is.xml
+++ b/src/chrome/content/rules/Archive.is.xml
@@ -1,21 +1,27 @@
 <!--
-	Nonfunctional hosts in *archive.is:
+	Problematic domains:
+		- (www.)archive.is ¹
+		- blog.archive.is ²
 
-		- blog *
-
-	* tumblr
+	¹ By webmaster request, we avoid redirecting anything to https://archive.is/ but ensure that the relevant connections are still upgraded by using archive.fo instead.
+	² Mismatch
 -->
 <ruleset name="Archive.is (partial)">
 
 	<target host="archive.today" />
 	<target host="blog.archive.today" />
 	<target host="www.archive.today" />
+	<target host="archive.fo" />
+	<target host="www.archive.fo" />
 	<target host="archive.is" />
 	<target host="www.archive.is" />
 	<target host="archive.li" />
 	<target host="blog.archive.li" />
 	<target host="www.archive.li" />
 
+	<rule from="^http://(www\.)?archive\.is/"
+		to="https://$1archive.fo/" />
+
 	<rule from="^http:"
 		to="https:" />