---
src/chrome/content/rules/DebConf.org.xml | 34 ++++++++++++++++++++--
.../content/rules/Debian-Administration.org.xml | 11 ++-----
src/chrome/content/rules/Debian-self-signed.xml | 15 ----------
src/chrome/content/rules/Debian.net.xml | 9 +++++-
.../content/rules/Debian.org-problematic.xml | 1 -
src/chrome/content/rules/Debian.xml | 25 +++++++++-------
6 files changed, 55 insertions(+), 40 deletions(-)
delete mode 100644 src/chrome/content/rules/Debian-self-signed.xml
diff --git a/src/chrome/content/rules/DebConf.org.xml
b/src/chrome/content/rules/DebConf.org.xml
index a8ceab0..81b0566 100644
--- a/src/chrome/content/rules/DebConf.org.xml
+++ b/src/chrome/content/rules/DebConf.org.xml
@@ -14,17 +14,45 @@
* Shows wiki, mismatched
-->
+<ruleset name="DebConf.org">
+
+ <!-- Direct rewrites:
+ -->
+ <target host="debconf0.debconf.org" />
+ <target host="debconf1.debconf.org" />
+ <target host="debconf2.debconf.org" />
+ <target host="debconf3.debconf.org" />
+ <target host="debconf4.debconf.org" />
+ <target host="debconf5.debconf.org" />
+ <target host="debconf6.debconf.org" />
+ <target host="debconf7.debconf.org" />
+ <target host="wiki.debconf.org" />
+ <target host="debconf0.debconf.org" />
+ <target host="debconf1.debconf.org" />
+ <target host="debconf2.debconf.org" />
+ <target host="debconf3.debconf.org" />
+ <target host="debconf4.debconf.org" />
+ <target host="debconf5.debconf.org" />
+ <target host="debconf6.debconf.org" />
+ <target host="debconf7.debconf.org" />
+ <target host="10years.debconf.org" />
+ <target host="es.debconf.org" />
+ <target host="fr.debconf.org" />
+ <target host="miniconf10.debconf.org" />
+
+ <rule from="^http:"
+ to="https:" />
+
+</ruleset>
+
<ruleset name="DebConf.org (partial)" default_off="self-signed">
<!-- Direct rewrites:
-->
<target host="db.debconf.org" />
- <target host="debconf7.debconf.org" />
<target host="gallery.debconf.org" />
<target host="penta.debconf.org" />
<target host="rt.debconf.org" />
- <target host="svn.debconf.org" />
- <target host="wiki.debconf.org" />
<rule from="^http:"
diff --git a/src/chrome/content/rules/Debian-Administration.org.xml
b/src/chrome/content/rules/Debian-Administration.org.xml
index aa6a44a..6f08f2b 100644
--- a/src/chrome/content/rules/Debian-Administration.org.xml
+++ b/src/chrome/content/rules/Debian-Administration.org.xml
@@ -1,15 +1,8 @@
-<!--
- Nonfunctional subdomains:
-
- - planet *
-
- * Dropped
-
--->
-<ruleset name="Debian-Administration.org (partial)">
+<ruleset name="Debian-Administration.org">
<target host="debian-administration.org" />
<target host="www.debian-administration.org" />
+ <target host="planet.debian-administration.org" />
<rule from="^http:"
diff --git a/src/chrome/content/rules/Debian-self-signed.xml
b/src/chrome/content/rules/Debian-self-signed.xml
deleted file mode 100644
index f7a9006..0000000
--- a/src/chrome/content/rules/Debian-self-signed.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!--
- For rules that are on by default, see Debian.net.xml.
-
--->
-<ruleset name="Debian.net (self-signed)" default_off="self-signed">
-
- <!-- Direct rewrites:
- -->
- <target host="mentors.debian.net" />
-
-
- <rule from="^http:"
- to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Debian.net.xml
b/src/chrome/content/rules/Debian.net.xml
index 72cefa2..dbb947d 100644
--- a/src/chrome/content/rules/Debian.net.xml
+++ b/src/chrome/content/rules/Debian.net.xml
@@ -6,7 +6,6 @@
Nonfunctional hosts in *debian.net:
- - archive ¹
- buildd-clang ¹
- changelogs ²
- cut *
@@ -41,6 +40,7 @@
<!-- Direct rewrites:
-->
<target host="aurel32.debian.net" />
+ <target host="archive.debian.net" />
<target host="ben.debian.net" />
<target host="binarycontrol.debian.net" />
<target host="bootstrap.debian.net" />
@@ -51,11 +51,18 @@
<target host="dochelp.debian.net" />
<target host="france.debian.net" />
<target host="jenkins.debian.net" />
+ <target host="mentors.debian.net" />
<target host="paste.debian.net" />
<target host="portfolio.debian.net" />
<target host="reproducible.debian.net" />
<target host="screenshots.debian.net" />
<target host="sources.debian.net" />
+ <target host="news.debian.net" />
+ <target host="debaday.debian.net" />
+ <target host="dedup.debian.net" />
+ <target host="pet.debian.net" />
+ <target host="pet-devel.debian.net" />
+ <target host="timeline.debian.net" />
<rule from="^http:"
diff --git a/src/chrome/content/rules/Debian.org-problematic.xml
b/src/chrome/content/rules/Debian.org-problematic.xml
index 111274b..f21700b 100644
--- a/src/chrome/content/rules/Debian.org-problematic.xml
+++ b/src/chrome/content/rules/Debian.org-problematic.xml
@@ -9,7 +9,6 @@
<target host="metadata.ftp-master.debian.org" />
<target host="ftp-master.metadata.debian.org" />
<target host="puppet-dashboard.debian.org" />
- <target host="security-master.debian.org" />
<rule from="^http:"
diff --git a/src/chrome/content/rules/Debian.xml
b/src/chrome/content/rules/Debian.xml
index a051aa8..e9a6746 100644
--- a/src/chrome/content/rules/Debian.xml
+++ b/src/chrome/content/rules/Debian.xml
@@ -29,8 +29,6 @@
- snapshot ⁶
- ftp.us ⁶
- - buildd.debian-ports.org ⁹
-
² Shows www
³ Shows db; mismatched, CN: db.debian.org
⁶ Refused
@@ -71,11 +69,6 @@
- www.udd.debian.org
- www.wiki.debian.org
-
- Insecure cookies are set for these hosts:
-
- - nm.debian.org
-
-->
<ruleset name="Debian.org (partial)">
@@ -86,23 +79,30 @@
<target host="*.alioth.debian.org" />
<target host="anonscm.debian.org" />
<target host="appstream.debian.org" />
+ <target host="archive-master.debian.org" />
<target host="bits.debian.org" />
<target host="bugs.debian.org" />
<target host="bugs-master.debian.org" />
<target host="buildd.debian.org" />
<target host="bzr.debian.org" />
+ <target host="cgi.debian.org" />
<target host="contributors.debian.org" />
<target host="cvs.debian.org" />
<target host="d-i.debian.org" />
<target host="darcs.debian.org" />
<target host="db.debian.org" />
+ <target host="browse.dgit.debian.org" />
+ <target host="git.dgit.debian.org" />
+ <target host="debtags.debian.org" />
<target host="dsa.debian.org" />
<target host="ftp-master.debian.org" />
<target host="api.ftp-master.debian.org" />
<target host="git.debian.org" />
<target host="gobby.debian.org" />
<target host="hg.debian.org" />
+ <target host="i18n.debian.org" />
<target host="jenkins.debian.org" />
+ <target host="l10n.debian.org" />
<target host="lintian.debian.org" />
<target host="lists.debian.org" />
<target host="munin.debian.org" />
@@ -111,25 +111,29 @@
<target host="packages.debian.org" />
<target host="people.debian.org" />
<target host="piuparts.debian.org" />
+ <target host="planet-search.debian.org" />
<target host="qa.debian.org" />
<target host="packages.qa.debian.org" />
<target host="release.debian.org" />
<target host="rt.debian.org" />
<target host="rtc.debian.org" />
<target host="search.debian.org" />
- <!--target host="security-master.debian.org" /-->
+ <target host="security-master.debian.org" />
<target host="security-tracker.debian.org" />
<!--target host="sip-ws.debian.org" /-->
<target host="sso.debian.org" />
<target host="svn.debian.org" />
+ <target host="syncproxy2.eu.debian.org" />
+ <target host="syncproxy3.eu.debian.org" />
+ <target host="syncproxy2.wna.debian.org" />
+ <target host="syncproxy.cna.debian.org" />
<target host="tracker.debian.org" />
<target host="udd.debian.org" />
<!--target host="veyepar.debian.org" /-->
<target host="vote.debian.org" />
<target host="wiki.debian.org" />
<target host="www.debian.org" />
-
- <!--target host="buildd.debian-ports.org" /-->
+ <target host="www-master.debian.org" />
<!-- Complications:
-->
@@ -152,7 +156,6 @@
<!-- Not secured by server:
-->
- <!--securecookie host="^nm\.debian\.org$" name="^csrftoken$" /-->
<securecookie host="^\w" name="." />
--
2.8.0.rc3
