From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 28 Jan 2015 17:30:31 +0000 (+0100)
Subject: Get rid of always broken http.d.net
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=faae8324a9f4f9aebf94ea891a769e5b73496587;p=mirror%2Fdsa-puppet.git

Get rid of always broken http.d.net
---

diff --git a/modules/schroot/files/schroot-dsa/config b/modules/schroot/files/schroot-dsa/config
index d2cc36869..688f8b6c6 100644
--- a/modules/schroot/files/schroot-dsa/config
+++ b/modules/schroot/files/schroot-dsa/config
@@ -43,7 +43,7 @@ CHROOT_FILE_UNPACK_DIR=/srv/chroot/schroot-unpack
 if [ -e /etc/schroot/dsa/default-mirror ]; then
     MIRROR=$(cat /etc/schroot/dsa/default-mirror )
 fi
-MIRROR=${MIRROR:-http.debian.net}
+MIRROR=${MIRROR:-ftp.debian.org}
 
 if [ "$(basename "$0")" = "00check" ] &&
    [ "$CHROOT_TYPE" = "file" ] &&
diff --git a/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources b/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
index a65532e02..08dab86fc 100755
--- a/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
+++ b/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
@@ -26,7 +26,7 @@ fi
 if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
   SRCL="${CHROOT_PATH}/etc/apt/sources.list.d/auto.list"
   rm -f "$SRCL"
-  mirror=${MIRROR:-http://http.debian.net/debian}
+  mirror=${MIRROR:-http://ftp.debian.org/debian}
 
   case "${SUITE_BASE:-}" in
     experimental)
diff --git a/modules/schroot/files/setup-dchroot b/modules/schroot/files/setup-dchroot
index 998ad4147..24a1857a7 100755
--- a/modules/schroot/files/setup-dchroot
+++ b/modules/schroot/files/setup-dchroot
@@ -150,7 +150,7 @@ arch="$THISARCH"
 if [ -e /etc/schroot/dsa/default-mirror ]; then
     mirror=$(cat /etc/schroot/dsa/default-mirror )
 fi
-mirror="${mirror:-http://http.debian.net/debian}"
+mirror="${mirror:-http://ftp.debian.org/debian}"
 configonly=""
 force=""
 basedir="/srv/chroot"
diff --git a/modules/schroot/templates/default-mirror.erb b/modules/schroot/templates/default-mirror.erb
index 0208890bc..48d680f0e 100644
--- a/modules/schroot/templates/default-mirror.erb
+++ b/modules/schroot/templates/default-mirror.erb
@@ -3,6 +3,6 @@ ninfo = scope.lookupvar('site::nodeinfo')
 if ninfo['hoster'].has_key?('mirror-debian') then
     ninfo['hoster']['mirror-debian']
 else
-    'http://http.debian.net/debian'
+    'http://ftp.debian.org/debian'
 end
 %>