Exhale.xml: Fixes and enhancements (EFForg#19148)

jayvdb · web-flow · commit 8d8586a14530 · 2020-04-17T10:06:13.000+08:00
* Exhale.xml: Add missing targets

* ruleset-whitelist.csv: Remove Exhale.xml

* Exhale.xml: Add target and simplify rule
diff --git a/src/chrome/content/rules/Exhale.xml b/src/chrome/content/rules/Exhale.xml
@@ -2,18 +2,21 @@
 	Problematic domains:
 
 		- (www.)4exhale.org	(502; mismatched, CN: *.electricembers.net)
+		- mail.exhaleprovoice.org	(mismatched, CN: *.outlook.com)
 
 -->
 <ruleset name="Exhale">
 
+	<target host="4exhale.org" />
+	<target host="www.4exhale.org" />
 	<target host="exhaleprovoice.org" />
 	<target host="www.exhaleprovoice.org" />
-
+	<target host="layout.exhaleprovoice.org" />
 
 	<rule from="^http://(?:www\.)?4exhale\.org/"
 		to="https://exhaleprovoice.org/" />
 
-	<rule from="^http://(www\.)?exhaleprovoice\.org/"
-		to="https://$1exhaleprovoice.org/" />
+	<rule from="^http:"
+		to="https:" />
 
 </ruleset>
diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv
@@ -686,7 +686,6 @@ de69b2a8fe3a9790c9aa7ce6435db3ad238567356e1a46ca1d374aa7944cbe31,0,1,Everyone_is
 83bc5eb214726e5221f5161cde0d085ac4d9c225d08c4611b6b6adebe8ca3c9a,0,1,Exaccess.ru.xml
 1d3186bff2492e46d6ff1324cedec5440076462c9869bdc1eb768bfd23bf9b65,1,1,Excelsior-USA.com.xml
 6841328fb4f2cbf6061dad6d4e8891fe0cbc9ff71db8155d4a10e3cb15ce1195,0,1,Executive_Interviews.biz.xml
-e75e74ab8881990d09963cb44ad19828540f1feabcedc6b54016f8e260f58e24,0,1,Exhale.xml
 480256c07545a3dd139fde94d8b794e8f8c8374a48c9f8c02d00b2c6aa5efaf8,0,1,EXiled.xml
 b164ef892520be08098945612a434b74349844dba5c7fe618b2e9e0b06fe70ca,1,0,Exinda.xml
 bb9a0e1c85c28f8f09687aad733547dc640569557197fdb9be79b85d9ce4931c,1,1,Ex_Libris.xml
