From a08c4a1d5c6aef8cf74a14429ca82b85304ec8da Mon Sep 17 00:00:00 2001
From: Scott Gonyea <me@sgonyea.com>
Date: Wed, 11 Nov 2015 13:18:36 -0800
Subject: [PATCH] Fix DailyKos.com. Force https protocol.

- Permit legacy images & assets subdomains to use http
---
 src/chrome/content/rules/DailyKos.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/chrome/content/rules/DailyKos.xml b/src/chrome/content/rules/DailyKos.xml
index 5aea020b778a..cdeda8cdb913 100644
--- a/src/chrome/content/rules/DailyKos.xml
+++ b/src/chrome/content/rules/DailyKos.xml
@@ -48,10 +48,10 @@
 	³ Rule disabled by default
 
 -->
-<ruleset name="DailyKos.com (partial)">
+<ruleset name="DailyKos.com">
 
-	<target host="dailykos.com" />
 	<target host="*.dailykos.com" />
+	<target host="dailykos.com" />
 		<!--
 			Lulz. Many account-related pages 307 to http.
 
@@ -109,7 +109,7 @@
 
 							-->
 		<!--exclusion pattern="^http://(?:www\.)?dailykos\.com/(?:$|\?|blog|contactus|diaries|groups?|jobs|masthead|new(?:s|thread|user)|part/user/popup/login|people|privacy|special|story|user)(?:$|\?|/)" /-->
-		<exclusion pattern="^http://(?:www\.)?dailykos\.com/+(?!(?:accounts|assets|c|donate|helpdesk_redirect|i|images|login|signup|subscribe|users)(?:$|[?/])|favicon\.ico)" />
+    <!-- <exclusion pattern="^http://(?:www\.)?dailykos\.com/+(?!(?:accounts|assets|c|donate|helpdesk_redirect|i|images|login|signup|subscribe|users)(?:$|[?/])|favicon\.ico)" /> -->
 		<!--
 			404s.
 				-->
@@ -117,15 +117,22 @@
 		<!--
 			Exceptions:
 					-->
-		<exclusion pattern="^http://images[12]?\.dailykos\.com/+(?!i/|images/)" />
+		<exclusion pattern="^http://images[12]?\.dailykos\.com" />
+		<exclusion pattern="^http://assets\.dailykos\.com" />
 
 
-	<rule from="^http://(www\.)?dailykos\.com/"
-		to="https://$1dailykos.com/" />
+	<rule from="^http://dailykos\.com/"
+		to="https://dailykos.com/" />
+
+	<rule from="^http://www\.dailykos\.com/"
+		to="https://www.dailykos.com/" />
 
 	<rule from="^http://assets\.dailykos\.com/"
 		to="https://www.dailykos.com/assets/" />
 
+	<rule from="^http://(.*)\.dailykos\.com/"
+		to="https://$1.dailykos.com/" />
+
 	<!--	At least some pages 404:
 					-->
 	<rule from="^http://campaigns\.dailykos\.com/(?=dia/|o/|salsa/)"
@@ -133,11 +140,4 @@
 
 	<rule from="^http://helpdesk\.dailykos\.com/(?=help/|pkg/|stylesheets/)"
 		to="https://dailykos.tenderapp.com/" />
-
-	<rule from="^http://images[12]?\.dailykos\.com/(?=images/)"
-		to="https://s3.amazonaws.com/dk-production/" />
-
-	<rule from="^http://images[12]?\.dailykos\.com/"
-		to="https://www.dailykos.com/" />
-
 </ruleset>