From 0f169630be946d66a83fbf59f88ce63b2deb9884 Mon Sep 17 00:00:00 2001
From: cschanaj <cschanaj@users.noreply.github.com>
Date: Sun, 13 Sep 2020 11:12:06 +0200
Subject: [PATCH 1/3] Rename and update CityMail.com.xml

---
 .../content/rules/{City-Mail.xml => CityMail.com.xml}      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename src/chrome/content/rules/{City-Mail.xml => CityMail.com.xml} (51%)

diff --git a/src/chrome/content/rules/City-Mail.xml b/src/chrome/content/rules/CityMail.com.xml
similarity index 51%
rename from src/chrome/content/rules/City-Mail.xml
rename to src/chrome/content/rules/CityMail.com.xml
index e8fe8e9f8c02..be9734d8a653 100644
--- a/src/chrome/content/rules/City-Mail.xml
+++ b/src/chrome/content/rules/CityMail.com.xml
@@ -2,16 +2,15 @@
 	For other Wizard Internet Services coverage, see Wizard-Internet-Services.xml.
 
 -->
-<ruleset name="City Mail">
+<ruleset name="CityMail.com">
 
 	<target host="cityemail.com" />
 	<target host="www.cityemail.com" />
 
 
-	<securecookie host="^(?:www\.)?cityemail\.com$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
-	<rule from="^http://(www\.)?cityemail\.com/"
-		to="https://$1cityemail.com/" />
+	<rule from="^http:" to="https:" />
 
 </ruleset>

From 62921200785b1e7f764ba912d0ed8b787bb4cbe5 Mon Sep 17 00:00:00 2001
From: cschanaj <cschanaj@users.noreply.github.com>
Date: Sun, 13 Sep 2020 12:18:35 +0200
Subject: [PATCH 2/3] Update Wizard-Internet-Services.xml

---
 .../content/rules/Wizard-Internet-Services.xml   | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/chrome/content/rules/Wizard-Internet-Services.xml b/src/chrome/content/rules/Wizard-Internet-Services.xml
index 6fac3b337e4c..bb05eb3ea0fa 100644
--- a/src/chrome/content/rules/Wizard-Internet-Services.xml
+++ b/src/chrome/content/rules/Wizard-Internet-Services.xml
@@ -1,26 +1,20 @@
 <!--
 	Other Wizard Internet Services rulesets:
 
-		- City-Mail.xml
+		+ CityMail.com.xml
 
 
 	Nonfunctional subdomains:
 
-		- (www.)
-		- hosting	(rx_record_too_long)
+		- wizard.ca
+		- www.wizard.ca
+		- mail.wizard.ca
 
 -->
 <ruleset name="Wizard Internet Services (partial)">
 
-	<target host="mail.wizard.ca" />
 	<target host="secure.wizard.ca" />
-
-
-	<!--	Cert mismatch, redirects like so.
-							-->
-	<rule from="^http://mail\.wizard\.ca/"
-		to="https://www.cityemail.com/" />
-
+	<target host="hosting.wizard.ca" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>

From 38401b22d2d953e5ed1a9474d56c3303dc30c588 Mon Sep 17 00:00:00 2001
From: cschanaj <cschanaj@users.noreply.github.com>
Date: Tue, 15 Sep 2020 14:13:02 +0200
Subject: [PATCH 3/3] Rename and update CityEmail.com.xml

---
 .../content/rules/{CityMail.com.xml => CityEmail.com.xml}       | 2 +-
 src/chrome/content/rules/Wizard-Internet-Services.xml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/chrome/content/rules/{CityMail.com.xml => CityEmail.com.xml} (89%)

diff --git a/src/chrome/content/rules/CityMail.com.xml b/src/chrome/content/rules/CityEmail.com.xml
similarity index 89%
rename from src/chrome/content/rules/CityMail.com.xml
rename to src/chrome/content/rules/CityEmail.com.xml
index be9734d8a653..e7c8c32b3de6 100644
--- a/src/chrome/content/rules/CityMail.com.xml
+++ b/src/chrome/content/rules/CityEmail.com.xml
@@ -2,7 +2,7 @@
 	For other Wizard Internet Services coverage, see Wizard-Internet-Services.xml.
 
 -->
-<ruleset name="CityMail.com">
+<ruleset name="CityEmail.com">
 
 	<target host="cityemail.com" />
 	<target host="www.cityemail.com" />
diff --git a/src/chrome/content/rules/Wizard-Internet-Services.xml b/src/chrome/content/rules/Wizard-Internet-Services.xml
index bb05eb3ea0fa..ee229eb963b3 100644
--- a/src/chrome/content/rules/Wizard-Internet-Services.xml
+++ b/src/chrome/content/rules/Wizard-Internet-Services.xml
@@ -1,7 +1,7 @@
 <!--
 	Other Wizard Internet Services rulesets:
 
-		+ CityMail.com.xml
+		+ CityEmail.com.xml
 
 
 	Nonfunctional subdomains: