---
src/chrome/content/rules/Debian-self-signed.xml | 4 ++--
src/chrome/content/rules/Debian.xml | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/chrome/content/rules/Debian-self-signed.xml
b/src/chrome/content/rules/Debian-self-signed.xml
index ccfc283..5501906 100644
--- a/src/chrome/content/rules/Debian-self-signed.xml
+++ b/src/chrome/content/rules/Debian-self-signed.xml
@@ -15,11 +15,11 @@
<!--
Nonfunctional:
-->
- <!--exclusion
pattern="^http://(ca|incoming|people|popcon|qa|packages.qa|search)\.debian\.org/"
/-->
+ <!--exclusion
pattern="^http://(ca|incoming|people|popcon|qa|search)\.debian\.org/" /-->
<!--
Handled in Debian.xml:
-->
- <!--exclusion
pattern="^http://(anonscm|arch|bugs(?:-master)?|buildd|bzr|contributors|cvs|darcs|db|dsa|ftp-master|git|hg|lists|munin|nagios|nm|openstack.bm|packages|piuparts|puppet-dashboard|release|rt|rtc|security-(?:tracker|master)|sip-ws|sso|svn|udd|vote|wiki|www)\.debian\.org/"
/-->
+ <!--exclusion
pattern="^http://(anonscm|arch|bugs(?:-master)?|buildd|bzr|contributors|cvs|darcs|db|dsa|ftp-master|git|hg|lists|munin|nagios|nm|openstack.bm|packages|piuparts|puppet-dashboard|packages.qa|release|rt|rtc|security-(?:tracker|master)|sip-ws|sso|svn|tracker,udd|vote|wiki|www)\.debian\.org/"
/-->
<rule from="^http://(mentors|paste)\.debian\.net/"
diff --git a/src/chrome/content/rules/Debian.xml
b/src/chrome/content/rules/Debian.xml
index 1844f21..8e2d23b 100644
--- a/src/chrome/content/rules/Debian.xml
+++ b/src/chrome/content/rules/Debian.xml
@@ -17,7 +17,6 @@
after fetching gpg.ganneff.de over
http...)
- popcon ¹
- qa ¹
- - packages.qa ¹
- search (shows www; mismatched, CN: debian.org)
¹ Refused
@@ -81,7 +80,7 @@
<securecookie host="^nm\.debian\.org$" name=".+" />
- <rule
from="^http://((?:anonscm|(?:[^/:@]+\.)?alioth|arch|bugs(?:-master)?|buildd|bzr|contributors|cvs|darcs|db|dsa|ftp-master|git|hg|lists|munin|nagios|nm|openstack\.bm|packages|piuparts|puppet-dashboard|release|rt|rtc|security-(?:tracker|master)|sip-ws|sso|svn|udd|vote|wiki|www)\.)?debian\.org/"
+ <rule
from="^http://((?:anonscm|(?:[^/:@]+\.)?alioth|arch|bugs(?:-master)?|buildd|bzr|contributors|cvs|darcs|db|dsa|ftp-master|git|hg|lists|munin|nagios|nm|openstack\.bm|packages|piuparts|puppet-dashboard|packages.qa|release|rt|rtc|security-(?:tracker|master)|sip-ws|sso|svn|tracker|udd|vote|wiki|www)\.)?debian\.org/"
to="https://$1debian.org/"; />
<rule from="^http://(france|screenshots)\.debian\.net/"
--
2.0.0
