cdn.debian.net has been deprecated, replace it with http.debian.net

https://lists.debian.org/CAG2RKXMdBLL-vSFW6dEu4P0NwT7qqor3PxVQDu-mwrM1J-6opw@mail.gmail.com

diff --git a/modules/schroot/files/schroot-dsa/config b/modules/schroot/files/schroot-dsa/config
index ba94f6fedcd993614c178ec56745eb3b388256cf..d2cc36869e1207a1dbacf810b7afb45a3f49883f 100644 (file)
--- 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:-cdn.debian.net}
+MIRROR=${MIRROR:-http.debian.net}
 
 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 029b3828e1f58a9aae26bdfedb11e0ac2ca64d4a..a65532e0243917770ca540c3c84296a67d897e96 100755 (executable)
--- 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://cdn.debian.net/debian}
+  mirror=${MIRROR:-http://http.debian.net/debian}
 
   case "${SUITE_BASE:-}" in
     experimental)

diff --git a/modules/schroot/files/setup-dchroot b/modules/schroot/files/setup-dchroot
index aeadf902ddc72a2be3859817226aded35ffb60da..998ad41478f3eeb6bea6ac4b09101dc31dc0c065 100755 (executable)
--- 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://cdn.debian.net/debian}"
+mirror="${mirror:-http://http.debian.net/debian}"
 configonly=""
 force=""
 basedir="/srv/chroot"

diff --git a/modules/schroot/templates/default-mirror.erb b/modules/schroot/templates/default-mirror.erb
index a5822f9a44be510e6bea13fb239f14e7c9ff6880..0208890bc38ffb657f3c0650d318d530c3f5a8de 100644 (file)
--- 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://cdn.debian.net/debian'
+    'http://http.debian.net/debian'
 end
 %>