Hi EFF folks--

the debian.org web infrastructure is sprouting HTTPS!

Attached please find a patch from Peter Palfreder <[email protected]>
against the master branch.  A patch against the stable branch will
follow from me shortly.

       --dkg

From 99abc9daeeeac9001a55b29a29aa17da547e77e8 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <[email protected]>
Date: Tue, 21 Jan 2014 19:51:16 +0100
Subject: [PATCH] Update debian.org rules

---
 src/chrome/content/rules/Debian-self-signed.xml |   20 +---------
 src/chrome/content/rules/Debian.xml             |   45 ++---------------------
 2 files changed, 5 insertions(+), 60 deletions(-)

diff --git a/src/chrome/content/rules/Debian-self-signed.xml b/src/chrome/content/rules/Debian-self-signed.xml
index afc84df..a9f137e 100644
--- a/src/chrome/content/rules/Debian-self-signed.xml
+++ b/src/chrome/content/rules/Debian-self-signed.xml
@@ -17,30 +17,15 @@
 		- paste.debian.net
 
 		- debian.org subdomains:
-
 			- alioth
-			- lists.alioth
-			- buildd
-			- db
-			- ftp-master
-			- lists
-			- nagios
-			- nm
-			- wiki
+			- piuparts
 
 -->
 <ruleset name="Debian (self-signed)" default_off="self-signed">
-
 	<target host="*.debconf.org" />
 	<target host="*.debian.net" />
 		<!--exclusion pattern="^http://screenshots\.debian\.net/"; /-->
 	<target host="*.debian.org" />
-		<!--exclusion pattern="^http://(anonscm|bugs|ca|cdimage|incoming|packages|people|qa|packages\.qa|search|svn|www)\.debian\.org/" /-->
-		<!--
-			Handled in Debian.xml:
-						-->
-		<!--exclusion pattern="^http://wiki\.debian\.org/"; /-->
-
 
 	<rule from="^http://(db|debconf7|gallery|penta|rt|svn|wiki)\.debconf\.org/"
 		to="https://$1.debconf.org/"; />
@@ -48,7 +33,6 @@
 	<rule from="^http://(mentors|paste)\.debian\.net/"
 		to="https://$1.debian.net/"; />
 
-	<rule from="^http://((?:lists\.)?alioth|buildd|db|ftp-master|lists|nagios|nm)\.debian\.org/"
+	<rule from="^http://(alioth|piuparts)\.debian\.org/"
 		to="https://$1.debian.org/"; />
-
 </ruleset>
diff --git a/src/chrome/content/rules/Debian.xml b/src/chrome/content/rules/Debian.xml
index 53f4c4d..5fbd2ad 100644
--- a/src/chrome/content/rules/Debian.xml
+++ b/src/chrome/content/rules/Debian.xml
@@ -1,11 +1,6 @@
 <!--
 	For problematic rules, see Debian-self-signed.xml.
-
-
 	Nonfunctional domains:
-
-		screenshots.debian.net *
-
 		debian.org subdomains:
 
 			- (www.) *
@@ -23,44 +18,10 @@
 			- search *
 			- svn		(shows alioth; mismatched, CN: alioth.debian.org)
 
-	* Refused
-
-
-	Problematic domains:
-
-		- debconf.org subdomains:
-
-			- debconf7 *
-			- db *
-			- gallery *
-			- penta *
-			- rt *
-			- svn *
-
-		- mentors.debian.net *
-		- paste.debian.net *
-
-		- debian.org subdomains:
-
-			- alioth *
-			- lists.alioth *
-			- buildd *
-			- db *
-			- ftp-master *
-			- lists *
-			- nagios *
-			- nm *
-			- wiki *
-
-	* Works, self-signed
-
 -->
 <ruleset name="Debian (partial)">
+	<target host="*.debian.org" />
 
-	<target host="wiki.debian.org" />
-
-
-	<rule from="^http://wiki\.debian\.org/";
-		to="https://wiki.debian.org/"; />
-
+	<rule from="^http://(bugs|buildd|contributors|db|dsa|ftp-master|lists|munin|nagios|nm|release|rt|security-tracker|sso|udd|vote|wiki|www)\.debian\.org/"
+		to="https://$1.debian.org/"; />
 </ruleset>
-- 
1.7.10.4

Attachment: pgpvMn_avkK3D.pgp
Description: PGP signature

Reply via email to