Bug#784151: tracker.debian.org: consider using httpredir.debian.org
Package: tracker.debian.org
Tags: patch
Followup-For: Bug #784151
Here is a proposed cherry-pick'able patch.
Cheers, OdyX
>From 260d3bf77725a1199fe7cd3a422e1372b5a46d17 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Mon, 6 Jul 2015 18:10:36 +0200
Subject: [PATCH] Use the official httpredir.debian.org instead of the
http.debian.net host
Closes: #784151
---
.../core/fixtures/debian-repositories.xml | 76 +++++++++++-----------
distro_tracker/core/tests/tests_utils.py | 4 +-
2 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/distro_tracker/core/fixtures/debian-repositories.xml b/distro_tracker/core/fixtures/debian-repositories.xml
index 81a2aae..6c6a02a 100644
--- a/distro_tracker/core/fixtures/debian-repositories.xml
+++ b/distro_tracker/core/fixtures/debian-repositories.xml
@@ -3,8 +3,8 @@
<object pk="1" model="core.repository">
<field type="CharField" name="name">Debian Oldstable</field>
<field type="CharField" name="shorthand">oldstable</field>
- <field type="CharField" name="uri">http://http.debian.net/debian</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian</field>
<field type="CharField" name="suite">oldstable</field>
<field type="CharField" name="codename">wheezy</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -18,8 +18,8 @@
<object pk="2" model="core.repository">
<field type="CharField" name="name">Debian Stable</field>
<field type="CharField" name="shorthand">stable</field>
- <field type="CharField" name="uri">http://http.debian.net/debian</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian</field>
<field type="CharField" name="suite">stable</field>
<field type="CharField" name="codename">jessie</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -33,8 +33,8 @@
<object pk="3" model="core.repository">
<field type="CharField" name="name">Debian Unstable</field>
<field type="CharField" name="shorthand">unstable</field>
- <field type="CharField" name="uri">http://http.debian.net/debian</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian</field>
<field type="CharField" name="suite">unstable</field>
<field type="CharField" name="codename">sid</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -48,8 +48,8 @@
<object pk="4" model="core.repository">
<field type="CharField" name="name">Debian Experimental</field>
<field type="CharField" name="shorthand">exp</field>
- <field type="CharField" name="uri">http://http.debian.net/debian</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian</field>
<field type="CharField" name="suite">experimental</field>
<field type="CharField" name="codename">experimental</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -93,8 +93,8 @@
<object pk="7" model="core.repository">
<field type="CharField" name="name">Debian Testing</field>
<field type="CharField" name="shorthand">testing</field>
- <field type="CharField" name="uri">http://http.debian.net/debian</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian</field>
<field type="CharField" name="suite">testing</field>
<field type="CharField" name="codename">stretch</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -123,8 +123,8 @@
<object pk="9" model="core.repository">
<field type="CharField" name="name">Debian Oldstable Backports</field>
<field type="CharField" name="shorthand">old-bpo</field>
- <field type="CharField" name="uri">http://http.debian.net/debian</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian</field>
<field type="CharField" name="suite">wheezy-backports</field>
<field type="CharField" name="codename">wheezy-backports</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -138,8 +138,8 @@
<object pk="10" model="core.repository">
<field type="CharField" name="name">Debian Stable Backports</field>
<field type="CharField" name="shorthand">stable-bpo</field>
- <field type="CharField" name="uri">http://http.debian.net/debian</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian</field>
<field type="CharField" name="suite">jessie-backports</field>
<field type="CharField" name="codename">jessie-backports</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -153,8 +153,8 @@
<object pk="11" model="core.repository">
<field type="CharField" name="name">Debian Oldstable Proposed Updates</field>
<field type="CharField" name="shorthand">old-p-u</field>
- <field type="CharField" name="uri">http://http.debian.net/debian</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian</field>
<field type="CharField" name="suite">oldstable-proposed-updates</field>
<field type="CharField" name="codename">wheezy-proposed-updates</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -168,8 +168,8 @@
<object pk="12" model="core.repository">
<field type="CharField" name="name">Debian Stable Proposed Updates</field>
<field type="CharField" name="shorthand">stable-p-u</field>
- <field type="CharField" name="uri">http://http.debian.net/debian</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian</field>
<field type="CharField" name="suite">proposed-updates</field>
<field type="CharField" name="codename">jessie-proposed-updates</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -183,8 +183,8 @@
<object pk="13" model="core.repository">
<field type="CharField" name="name">Debian Testing Proposed Updates</field>
<field type="CharField" name="shorthand">test-p-u</field>
- <field type="CharField" name="uri">http://http.debian.net/debian</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian</field>
<field type="CharField" name="suite">testing-proposed-updates</field>
<field type="CharField" name="codename">stretch-proposed-updates</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -198,8 +198,8 @@
<object pk="14" model="core.repository">
<field type="CharField" name="name">Debian Squeeze LTS</field>
<field type="CharField" name="shorthand">o-o-lts</field>
- <field type="CharField" name="uri">http://http.debian.net/debian</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian</field>
<field type="CharField" name="suite">squeeze-lts</field>
<field type="CharField" name="codename">squeeze-lts</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -213,8 +213,8 @@
<object pk="15" model="core.repository">
<field type="CharField" name="name">Debian Oldstable Updates</field>
<field type="CharField" name="shorthand">old-upd</field>
- <field type="CharField" name="uri">http://http.debian.net/debian</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian</field>
<field type="CharField" name="suite">oldstable-updates</field>
<field type="CharField" name="codename">wheezy-updates</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -228,8 +228,8 @@
<object pk="16" model="core.repository">
<field type="CharField" name="name">Debian Stable Updates</field>
<field type="CharField" name="shorthand">stable-upd</field>
- <field type="CharField" name="uri">http://http.debian.net/debian</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian</field>
<field type="CharField" name="suite">stable-updates</field>
<field type="CharField" name="codename">jessie-updates</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -243,8 +243,8 @@
<object pk="17" model="core.repository">
<field type="CharField" name="name">Debian Oldstable Backports Sloppy</field>
<field type="CharField" name="shorthand">old-bpo-sl</field>
- <field type="CharField" name="uri">http://http.debian.net/debian</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian</field>
<field type="CharField" name="suite">wheezy-backports-sloppy</field>
<field type="CharField" name="codename">wheezy-backports-sloppy</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -258,8 +258,8 @@
<object pk="18" model="core.repository">
<field type="CharField" name="name">Debian Oldoldstable</field>
<field type="CharField" name="shorthand">o-o-stable</field>
- <field type="CharField" name="uri">http://http.debian.net/debian</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian</field>
<field type="CharField" name="suite">oldoldstable</field>
<field type="CharField" name="codename">squeeze</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -288,8 +288,8 @@
<object pk="20" model="core.repository">
<field type="CharField" name="name">Debian Oldoldstable Backports</field>
<field type="CharField" name="shorthand">o-o-bpo</field>
- <field type="CharField" name="uri">http://http.debian.net/debian-backports</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian-backports</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian-backports</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian-backports</field>
<field type="CharField" name="suite">squeeze-backports</field>
<field type="CharField" name="codename">squeeze-backports</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -303,8 +303,8 @@
<object pk="21" model="core.repository">
<field type="CharField" name="name">Debian Oldoldstable Backports Sloppy</field>
<field type="CharField" name="shorthand">o-o-bpo-sl</field>
- <field type="CharField" name="uri">http://http.debian.net/debian-backports</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian-backports</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian-backports</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian-backports</field>
<field type="CharField" name="suite">squeeze-backports-sloppy</field>
<field type="CharField" name="codename">squeeze-backports-sloppy</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -318,8 +318,8 @@
<object pk="22" model="core.repository">
<field type="CharField" name="name">Debian Oldoldstable Updates</field>
<field type="CharField" name="shorthand">o-o-upd</field>
- <field type="CharField" name="uri">http://http.debian.net/debian</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian</field>
<field type="CharField" name="suite">oldoldstable-updates</field>
<field type="CharField" name="codename">squeeze-updates</field>
<field type="TextField" name="components">main contrib non-free</field>
@@ -333,8 +333,8 @@
<object pk="23" model="core.repository">
<field type="CharField" name="name">Debian Oldoldstable Proposed Updates</field>
<field type="CharField" name="shorthand">o-o-pu</field>
- <field type="CharField" name="uri">http://http.debian.net/debian</field>
- <field type="CharField" name="public_uri">http://http.debian.net/debian</field>
+ <field type="CharField" name="uri">http://httpredir.debian.org/debian</field>
+ <field type="CharField" name="public_uri">http://httpredir.debian.org/debian</field>
<field type="CharField" name="suite">oldoldstable-proposed-updates</field>
<field type="CharField" name="codename">squeeze-proposed-updates</field>
<field type="TextField" name="components">main contrib non-free</field>
diff --git a/distro_tracker/core/tests/tests_utils.py b/distro_tracker/core/tests/tests_utils.py
index fcc45aa..81997f7 100644
--- a/distro_tracker/core/tests/tests_utils.py
+++ b/distro_tracker/core/tests/tests_utils.py
@@ -1310,7 +1310,7 @@ class AptCacheTests(TestCase):
repository = Repository.objects.create(
name='stable',
shorthand='stable',
- uri='http://http.debian.net/debian/dists',
+ uri='http://httpredir.debian.org/debian/dists',
suite='stable')
expected_source_files = [
'main_source_Sources',
@@ -1341,7 +1341,7 @@ class AptCacheTests(TestCase):
repository = Repository.objects.create(
name='stable',
shorthand='stable',
- uri='http://http.debian.net/debian/dists',
+ uri='http://httpredir.debian.org/debian/dists',
suite='stable')
expected_packages_files = [
'main_binary-amd64_Packages',
--
2.1.4
Reply to: