Re-activate and Update Portsmouth.gov.uk.xml (EFForg#13544)

Chan Chak Shing · J0WI · commit 4f253cdf4a95 · 2017-11-11T13:29:55.000+01:00
* Re-activate and Update Portsmouth.gov.uk.xml

* Whitelist GOV.UK.xml from rules-test

* Update Portsmouth.gov.uk.xml
diff --git a/src/chrome/content/rules/GOV.UK.xml b/src/chrome/content/rules/GOV.UK.xml
@@ -234,7 +234,7 @@
 		- Peterborough.gov.uk.xml
 		- planningportal.gov.uk.xml
 		- plymouth.gov.uk.xml
-		- portsmouth.gov.uk.xml
+		- Portsmouth.gov.uk.xml
 		- powys.gov.uk.xml
 		- preston.gov.uk.xml
 		- Race_to_Health.co.uk.xml
diff --git a/src/chrome/content/rules/Portsmouth.gov.uk.xml b/src/chrome/content/rules/Portsmouth.gov.uk.xml
@@ -0,0 +1,53 @@
+<!--
+	For other UK government coverage, see GOV.UK.xml.
+
+	Non-functional hosts
+		Couldn't connect to server:
+		- parkandride.portsmouth.gov.uk
+		- publicaccess.portsmouth.gov.uk
+		- spocc.portsmouth.gov.uk
+
+		SSL connect error:
+		- www.las.portsmouth.gov.uk
+
+		SSL peer certificate was not OK:
+		- www.ataleofonecity.portsmouth.gov.uk
+		- democracy.portsmouth.gov.uk
+		- www.emas.portsmouth.gov.uk
+		- www.jsna.portsmouth.gov.uk
+		- www.mediastore.portsmouth.gov.uk
+		- servicesnetwork.portsmouth.gov.uk
+
+		Incomplete certificate chain error:
+		- portsmouth.gov.uk
+		- adoption.portsmouth.gov.uk
+		- foster.portsmouth.gov.uk
+		- jsna.portsmouth.gov.uk
+		- www.portsmouth.gov.uk
+-->
+<ruleset name="Portsmouth.gov.uk">
+	<target host="admissions.portsmouth.gov.uk" />
+	<target host="adultdp.portsmouth.gov.uk" />
+	<target host="www.adultdp.portsmouth.gov.uk" />
+	<target host="airquality.portsmouth.gov.uk" />
+	<target host="bigrecycle.portsmouth.gov.uk" />
+	<target host="brightfutures.portsmouth.gov.uk" />
+	<target host="www.forms.portsmouth.gov.uk" />
+	<target host="emas.portsmouth.gov.uk" />
+	<target host="www.emas.portsmouth.gov.uk" />
+	<target host="mediastore.portsmouth.gov.uk" />
+	<target host="www.mediastore.portsmouth.gov.uk" />
+	<target host="parkingtickets.portsmouth.gov.uk" />
+	<target host="scip.portsmouth.gov.uk" />
+	<target host="securetransfer.portsmouth.gov.uk" />
+	<target host="volunteer.portsmouth.gov.uk" />
+
+	<rule from="^http://www\.emas\.portsmouth\.gov\.uk/"
+			to="https://emas.portsmouth.gov.uk/" />
+
+	<rule from="^http://www\.mediastore\.portsmouth\.gov\.uk/"
+			to="https://mediastore.portsmouth.gov.uk/" />
+
+	<rule from="^http:" 
+			to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/portsmouth.gov.uk.xml b/src/chrome/content/rules/portsmouth.gov.uk.xml
diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv
@@ -1375,7 +1375,7 @@ dbc8f2862e1855fd07a89a7d842b4ff03b2a93340d912a1f321e8a2c9a0840a8,1,1,GO_Transit.
 73cc7eb8fa700154372dbc586aaa1adc8d0c0b86d17f2efcc14b7e9843a09004,1,1,Got_Vape.net.xml
 b2ee2374e3bdc3d03f5d60bd4b00bec95592a38b54a32a8b3097d1ec6cf1c86b,1,1,GourmetGiftBaskets.com.xml
 38ea979b7f650765d00622f7919e2589f093c8f0df62b005e1ee37f97e821289,1,1,Government-Security-News.xml
-89ea4ec363d55d47b4d4689fd67aa847e8f6393d8b8609c7167392ae5f9e00a4,1,0,GOV.UK.xml
+d4ac9612c814f635beceb9ccba936b25fe6c20a1517260fc56cc36e29b7d8a72,1,0,GOV.UK.xml
 b4741f899272079753bb0118f166d0130bbedf31d16434e9b8127821fcc41f50,1,0,GoWork.pl.xml
 0ee8f20c7adbecd195a0b332aaeb6fa49a1b97192c94840236733f0a29dd5d75,1,0,GQ-magazine.co.uk.xml
 b4936c9408ab836adc37b0b41551860a35d85bd2adb24c2df60cc8fc04084e55,0,1,Grab_Media.xml
