@@ -2,16 +2,15 @@
 	For other Wizard Internet Services coverage, see Wizard-Internet-Services.xml.
 
 -->
-<ruleset name="City Mail">
+<ruleset name="CityEmail.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>
@@ -1,26 +1,20 @@
 <!--
 	Other Wizard Internet Services rulesets:
 
-		- City-Mail.xml
+		+ CityEmail.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>