On Wed 2014-01-22 17:38:02 -0500, Daniel Kahn Gillmor wrote:

> 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.

And attached is the patch for the stable branch.

Let me know if there are any issues with it (i think it should be
uncontroversial).

    --dkg

commit 2412057e924d4c4d4f35b4e0fc9b8c60ce2a5009
Author: Daniel Kahn Gillmor <[email protected]>
Date:   Wed Jan 22 17:34:13 2014 -0500

    updated to include debian infrastructure changes

diff --git a/src/chrome/content/rules/Debian.xml b/src/chrome/content/rules/Debian.xml
index e1e39fa..1d0cf89 100644
--- a/src/chrome/content/rules/Debian.xml
+++ b/src/chrome/content/rules/Debian.xml
@@ -6,7 +6,7 @@
 <ruleset name="Debian">
 	<target host="*.debian.org"/>
 
-	<rule from="^http://(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>
 
diff --git a/src/chrome/content/rules/DebianOwnCA.xml b/src/chrome/content/rules/DebianOwnCA.xml
index 75ee7b9..4e9d664 100644
--- a/src/chrome/content/rules/DebianOwnCA.xml
+++ b/src/chrome/content/rules/DebianOwnCA.xml
@@ -24,13 +24,12 @@
 
 	<target host="*.debian.net" />
 	<target host="*.debian.org"/>
-	<target host="*.alioth.debian.org"/>
 	<target host="*.debconf.org"/>
 
 	<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/"/>
 
 	<rule from="^http://(wiki|penta|debconf7|db|rt|gallery|svn)\.debconf\.org/"

Attachment: pgpxqM2r7qSXX.pgp
Description: PGP signature

Reply via email to