Update Ubuntu.xml (#19154)

* Update Ubuntu.xml

* Update Ubuntu.xml

* Create AskUbuntu.com.xml

* Update Ubuntu (CN) related rulesets

* Remove AskUbuntu.com.xml

Author: Chan Chak Shing

src/chrome/content/rules/Ubuntu-CN.xml

@@ -0,0 +1,14 @@
+<!--
+	For other Ubuntu.com related rulesets, see
+		+ Ubuntu.xml
+-->
+<ruleset name="Ubuntu.com.cn">
+	<target host="ubuntu.com.cn" />
+	<target host="forum.ubuntu.com.cn" />
+	<target host="linux.ubuntu.com.cn" />
+	<target host="paste.ubuntu.com.cn" />
+	<target host="wiki.ubuntu.com.cn" />
+	<target host="www.ubuntu.com.cn" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>

src/chrome/content/rules/Ubuntu.com.cn.xml

@@ -0,0 +1,14 @@
+<!--
+	For other Ubuntu.com related rulesets, see
+		+ Ubuntu.xml
+-->
+<ruleset name="Ubuntu.org.cn">
+	<target host="ubuntu.org.cn" />
+	<target host="forum.ubuntu.org.cn" />
+	<target host="linux.ubuntu.org.cn" />
+	<target host="paste.ubuntu.org.cn" />
+	<target host="wiki.ubuntu.org.cn" />
+	<target host="www.ubuntu.org.cn" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>

src/chrome/content/rules/Ubuntu.org.cn.xml

@@ -1,57 +1,37 @@
 <!--
 	Other Ubuntu rulesets:
-		+ Ubuntu-CN.xml
+		+ Ubuntu.com.cn.xml
+		+ Ubuntu.org.cn.xml
 
-	Preloaded hosts
+	HSTS preloaded:
 		- login.ubuntu.com
 
 	Non-functional hosts
 		Couldn't connect to server:
-			 - archive.ubuntu.com
-			 - cdimage.ubuntu.com
-			 - font.ubuntu.com
-			 - old-releases.ubuntu.com
-			 - one.ubuntu.com
-			 - releases.ubuntu.com
-			 - screenshots.ubuntu.com
-			 - security.ubuntu.com
-			 - tour.ubuntu.com
-			 - upstart.ubuntu.com
+		- archive.ubuntu.com
+		- cdimage.ubuntu.com
+		- old-releases.ubuntu.com
+		- security.ubuntu.com
 
 		Timeout was reached:
-			 - brainstorm.ubuntu.com
-			 - bugs.ubuntu.com
-			 - cloud.ubuntu.com
-			 - jobs.ubuntu.com
-			 - kernel.ubuntu.com
-			 - people.ubuntu.com
-			 - phablet.ubuntu.com
-			 - planet.ubuntu.com
-			 - popcon.ubuntu.com
-			 - reports.qa.ubuntu.com
-			 - women.ubuntu.com
+		- reports.qa.ubuntu.com
+		- women.ubuntu.com
 
 		SSL connect error:
-			 - loco.ubuntu.com
-			 - iso.qa.ubuntu.com
-			 - testcases.qa.ubuntu.com
+		- status.ubuntu.com
+		- summit.ubuntu.com
 
 		SSL peer certificate was not OK:
-			 - pad.ubuntu.com
-			 - status.ubuntu.com
-
-		Peer certificate cannot be authenticated with given CA certificates:
-			 - ask.ubuntu.com
-			 - packaging.ubuntu.com
+		- ask.ubuntu.com
+		- brainstorm.ubuntu.com
+		- bugs.ubuntu.com
+		- upstart.ubuntu.com
 
 		Mixed content blocking (MCB) triggered:
-			 - lists.ubuntu.com
-			 - odm.ubuntu.com
-			 - summit.ubuntu.com
-			 - uds.ubuntu.com
-
-		Incomplete certificate chain:
-			 - certification.ubuntu.com
+		- lists.ubuntu.com
+		- odm.ubuntu.com
+		- iso.qa.ubuntu.com
+		- testcases.qa.ubuntu.com
 -->
 <ruleset name="Ubuntu.com (partial)">
 	<target host="ubuntu.com" />
@@ -60,32 +40,45 @@
 	<target host="assets.ubuntu.com" />
 		<test url="http://assets.ubuntu.com/v1/0df231d4-core-print.css" />
 	<target host="buy.ubuntu.com" />
+	<target host="certification.ubuntu.com" />
 	<target host="changelogs.ubuntu.com" />
+	<target host="cloud.ubuntu.com" />
 	<target host="cloud-images.ubuntu.com" />
 	<target host="community.ubuntu.com" />
 	<target host="design.ubuntu.com" />
 	<target host="developer.ubuntu.com" />
 	<target host="myapps.developer.ubuntu.com" />
 	<target host="entropy.ubuntu.com" />
 	<target host="errors.ubuntu.com" />
+	<target host="font.ubuntu.com" />
 	<target host="fridge.ubuntu.com" />
 	<target host="help.ubuntu.com" />
 	<target host="insights.ubuntu.com" />
 	<target host="irclogs.ubuntu.com" />
+	<target host="jobs.ubuntu.com" />
 	<target host="juju.ubuntu.com" />
+	<target host="kernel.ubuntu.com" />
 	<target host="keyserver.ubuntu.com" />
-		<!-- HTTPS doesn't work on port 11371 -->
-		<exclusion pattern="^http://keyserver\.ubuntu\.com:11371/" />
-			<test url="http://keyserver.ubuntu.com:11371/pks/lookup?op=vindex&amp;search=extension-devs%40eff.org&amp;fingerprint=on" />
+	<!-- HTTPS doesn't work on port 11371 -->
+	<exclusion pattern="^http://keyserver\.ubuntu\.com:11371/" />
+		<test url="http://keyserver.ubuntu.com:11371/pks/lookup?op=vindex&amp;search=extension-devs%40eff.org&amp;fingerprint=on" />
+	<target host="loco.ubuntu.com" />
 	<target host="maas.ubuntu.com" />
 	<target host="manpages.ubuntu.com" />
 	<target host="merges.ubuntu.com" />
 	<target host="packages.ubuntu.com" />
+	<target host="packaging.ubuntu.com" />
+	<target host="pad.ubuntu.com" />
 	<target host="partners.ubuntu.com" />
 	<target host="paste.ubuntu.com" />
 	<target host="pastebin.ubuntu.com" />
 	<target host="patches.ubuntu.com" />
-	<target host="shop.ubuntu.com" />
+	<target host="people.ubuntu.com" />
+	<target host="planet.ubuntu.com" />
+	<target host="popcon.ubuntu.com" />
+	<target host="releases.ubuntu.com" />
+		<test url="http://releases.ubuntu.com/19.10/SHA256SUMS.gpg" />
+	<target host="tour.ubuntu.com" />
 	<target host="tutorials.ubuntu.com" />
 	<target host="uec-images.ubuntu.com" />
 	<target host="wiki.ubuntu.com" />