Switch to httpredir.debian.org.feature/9235-httpredir.debian.org

Refs: #9235

8 files changed, 11 insertions, 11 deletions

diff --git a/auto/config b/auto/config
index 661e64d..85df348 100755
--- a/auto/config
+++ b/auto/config
@@ -37,9 +37,9 @@ $RUN_LB_CONFIG \
    --iso-publisher="https://tails.boum.org/" \
    --iso-volume="TAILS ${AMNESIA_FULL_VERSION}" \
    --memtest none \
-   --mirror-binary "http://ftp.us.debian.org/debian/" \
-   --mirror-bootstrap "http://ftp.us.debian.org/debian/" \
-   --mirror-chroot "http://ftp.us.debian.org/debian/" \
+   --mirror-binary "http://httpredir.debian.org/debian/" \
+   --mirror-bootstrap "http://httpredir.debian.org/debian/" \
+   --mirror-chroot "http://httpredir.debian.org/debian/" \
    --packages-lists="standard" \
    --tasks="standard" \
    --linux-packages="linux-image-3.16.0-4" \
diff --git a/config/chroot_sources/experimental.chroot b/config/chroot_sources/experimental.chroot
index 67f84e4..f125155 100644
--- a/config/chroot_sources/experimental.chroot
+++ b/config/chroot_sources/experimental.chroot
@@ -1 +1 @@
-deb http://ftp.us.debian.org/debian/ experimental main
+deb http://httpredir.debian.org/debian/ experimental main
diff --git a/config/chroot_sources/jessie.chroot b/config/chroot_sources/jessie.chroot
index b7f9385..e1af078 100644
--- a/config/chroot_sources/jessie.chroot
+++ b/config/chroot_sources/jessie.chroot
@@ -1 +1 @@
-deb http://ftp.us.debian.org/debian/ jessie main contrib non-free
+deb http://httpredir.debian.org/debian/ jessie main contrib non-free
diff --git a/config/chroot_sources/sid.chroot b/config/chroot_sources/sid.chroot
index c91091e..14e445c 100644
--- a/config/chroot_sources/sid.chroot
+++ b/config/chroot_sources/sid.chroot
@@ -1 +1 @@
-deb http://ftp.us.debian.org/debian/ unstable main contrib non-free
+deb http://httpredir.debian.org/debian/ unstable main contrib non-free
diff --git a/config/chroot_sources/testing.chroot b/config/chroot_sources/testing.chroot
index deb426b..bb97a1a 100644
--- a/config/chroot_sources/testing.chroot
+++ b/config/chroot_sources/testing.chroot
@@ -1 +1 @@
-deb http://ftp.us.debian.org/debian/ testing main contrib non-free
+deb http://httpredir.debian.org/debian/ testing main contrib non-free
diff --git a/config/chroot_sources/wheezy-backports.chroot b/config/chroot_sources/wheezy-backports.chroot
index 06d3ade..78d3be3 100644
--- a/config/chroot_sources/wheezy-backports.chroot
+++ b/config/chroot_sources/wheezy-backports.chroot
@@ -1 +1 @@
-deb http://ftp.us.debian.org/debian/ wheezy-backports main contrib non-free
+deb http://httpredir.debian.org/debian/ wheezy-backports main contrib non-free
diff --git a/features/apt.feature b/features/apt.feature
index 0aa70ed..6251d39 100644
--- a/features/apt.feature
+++ b/features/apt.feature
@@ -19,7 +19,7 @@ Feature: Installing packages through APT
     And I save the state so the background can be restored next scenario
 
   Scenario: APT sources are configured correctly
-    Then the only hosts in APT sources are "ftp.us.debian.org,security.debian.org,backports.debian.org,deb.tails.boum.org,deb.torproject.org,mozilla.debian.net"
+    Then the only hosts in APT sources are "httpredir.debian.org,security.debian.org,backports.debian.org,deb.tails.boum.org,deb.torproject.org,mozilla.debian.net"
 
   @check_tor_leaks
   Scenario: Install packages using apt-get
diff --git a/vagrant/provision/setup-tails-builder b/vagrant/provision/setup-tails-builder
index 406650b..b8f5acc 100755
--- a/vagrant/provision/setup-tails-builder
+++ b/vagrant/provision/setup-tails-builder
@@ -42,7 +42,7 @@ http_proxy="" gpg --keyserver hkps.pool.sks-keyservers.net --recv-key C7988EA7A3
 gpg --export C7988EA7A358D82E | sudo apt-key add -
 
 # Add unstable repository for ikiwiki, and pin it low
-echo 'deb http://ftp.us.debian.org/debian unstable main' > /etc/apt/sources.list.d/unstable.list
+echo 'deb http://httpredir.debian.org/debian unstable main' > /etc/apt/sources.list.d/unstable.list
 sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/unstable <<EOF
 	Package: *
 	Pin: release a=unstable
@@ -56,7 +56,7 @@ EOF
 
 # Add wheezy-backports for apt-cacher-ng. The version in wheezy has problems
 # with redirects to https, which we need when fetching the TBB tarballs
-echo 'deb http://ftp.us.debian.org/debian wheezy-backports main' > /etc/apt/sources.list.d/wheezy-backports.list
+echo 'deb http://httpredir.debian.org/debian wheezy-backports main' > /etc/apt/sources.list.d/wheezy-backports.list
 
 apt-get update
 apt-get -o Dpkg::Options::="--force-confold" -y -t wheezy-backports install apt-cacher-ng