Replace all references to ftp.de.debian.org with cdn.debian.org

diff --git a/debian/changelog b/debian/changelog
index bd3bb54..eb64b85 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,9 @@ grml-live (0.9.21) UNRELEASED; urgency=low
     (new DCS directory feature).
   * Drop package grml-saveconfig as it is replaced with recent versions
     of grml-autoconfig.
+  * Replace all references to ftp.de.debian.org with cdn.debian.org,
+    see http://wiki.debian.org/DebianGeoMirror for details.
+    Thanks for the idea, Marc Haber!
   * Software related changes:
     - Add git-email to GRML_FULL (thanks to Joerg Woelke for mentioning).
     - Add aesfix, aeskeyfind, bios-memimage, chaosreader, ext3grep, fatback,
@@ -66,7 +69,7 @@ grml-live (0.9.21) UNRELEASED; urgency=low
   * Fix going back to GNU GRUB from ldbsd.com via alternative boot method;
     while here, add the grml release info to the appropriate file.
 
- -- Michael Prokop <mika@grml.org>  Mon, 17 Aug 2009 03:34:10 +0200
+ -- Michael Prokop <mika@grml.org>  Mon, 17 Aug 2009 21:48:57 +0200
 
 grml-live (0.9.20) unstable; urgency=low
 

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 54d15d2..2a30bf4 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -603,7 +603,7 @@ Instructions
   CHROOT_INSTALL="/etc/grml/fai/chroot_install"
   ## adjust if necessary (defaults to /grml/grml-live):
   ## OUTPUT="/srv/grml-live"
-  FAI_DEBOOTSTRAP="squeeze http://ftp.de.debian.org/debian/"
+  FAI_DEBOOTSTRAP="squeeze http://cdn.debian.net/debian/"
   ARCH="i386"
   CLASSES="GRMLBASE,GRML_MEDIUM,I386"
   ZERO_LOGFILE='1'
@@ -611,7 +611,7 @@ Instructions
   GRML_LIVE_SOURCES="
   deb http://deb.grml.org/            grml-stable  main
   deb http://deb.grml.org/            grml-testing main
-  deb http://ftp.de.debian.org/debian squeeze main contrib non-free
+  deb http://cdn.debian.net/debian squeeze main contrib non-free
   "
   EOF
 
@@ -742,7 +742,7 @@ How do I create a base.tgz for use as NFSROOT?
 First of all build the chroot system:
 
   mkdir /tmp/nfsroot && cd /tmp/nfsroot
-  debootstrap lenny /tmp/nfsroot/ http://ftp.de.debian.org/debian
+  debootstrap lenny /tmp/nfsroot/ http://cdn.debian.net/debian
   tar zcf base.tgz ./
 
 Then check out where your NFSROOT is located:
@@ -788,10 +788,10 @@ FAI_DEBOOTSTRAP:
   GRML_LIVE_SOURCES="
   deb http://localhost:3142/deb.grml.org grml-stable  main
   deb http://localhost:3142/deb.grml.org grml-testing main
-  deb http://localhost:3142/ftp.de.debian.org/debian lenny main contrib non-free
+  deb http://localhost:3142/cdn.debian.net/debian lenny main contrib non-free
   "
   [...]
-  FAI_DEBOOTSTRAP="lenny http://localhost:3142/ftp.de.debian.org/debian lenny main contrib non-free"
+  FAI_DEBOOTSTRAP="lenny http://localhost:3142/cdn.debian.net/debian lenny main contrib non-free"
 
 Make sure apt-cacher / apt-cacher-ng is running ('/etc/init.d/apt-cacher
 restart' or '/etc/init.d/apt-cacher-ng restart'). That's it.  All downloaded

diff --git a/etc/grml/fai/apt/sources.list b/etc/grml/fai/apt/sources.list
index 79683e8..69b6293 100644 (file)
--- a/etc/grml/fai/apt/sources.list
+++ b/etc/grml/fai/apt/sources.list
@@ -4,4 +4,4 @@
 # and using /etc/grml/fai/files/etc/apt instead!'
 deb http://deb.grml.org/            grml-stable  main
 deb http://deb.grml.org/            grml-testing main
-deb http://ftp.de.debian.org/debian lenny        main contrib non-free
+deb http://cdn.debian.net/debian lenny        main contrib non-free

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
index 03c153b..a35de27 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
@@ -43,8 +43,8 @@ fi
 # configure official Debian repositories:
 cat > "$DEBIAN_SOURCES_LIST" << EOF
 # official debian repository:
-  deb     http://ftp.de.debian.org/debian/ $SUITE main contrib non-free
-  deb-src http://ftp.de.debian.org/debian/ $SUITE main contrib non-free
+  deb     http://cdn.debian.net/debian/ $SUITE main contrib non-free
+  deb-src http://cdn.debian.net/debian/ $SUITE main contrib non-free
 EOF
 
 # configure grml-stable repository:

diff --git a/etc/grml/fai/make-fai-nfsroot.conf b/etc/grml/fai/make-fai-nfsroot.conf
index 20e41b6..e8ffc77 100644 (file)
--- a/etc/grml/fai/make-fai-nfsroot.conf
+++ b/etc/grml/fai/make-fai-nfsroot.conf
@@ -13,7 +13,7 @@ TFTPROOT=/srv/tftp/fai
 #NFSROOT_ETC_HOSTS="192.168.1.250 yourinstallserver"
 
 # debootstrap commandline
-FAI_DEBOOTSTRAP="lenny http://ftp.de.debian.org/debian"
+FAI_DEBOOTSTRAP="lenny http://cdn.debian.net/debian"
 
 # which options do you want to use for debootstrap?
 FAI_DEBOOTSTRAP_OPTS="--exclude=dhcp-client,info"

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index e4af5c2..db0f43b 100644 (file)
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -64,7 +64,7 @@
 #deb http://192.168.1.112/debian     lenny        main contrib non-free
 #deb http://deb.grml.org/            grml-stable  main
 #deb http://deb.grml.org/            grml-testing main
-#deb http://ftp.de.debian.org/debian etch         main contrib non-free
+#deb http://cdn.debian.net/debian etch         main contrib non-free
 #"
 
 # Which Debian suite and which mirror do you want to use for debootstrapping?
@@ -72,7 +72,7 @@
 # taken. If you specify a value then the file /etc/grml/fai/make-fai-nfsroot.conf
 # will be updated by grml-live on-the-fly.
 # Usage: "<suite> <mirror>"
-# FAI_DEBOOTSTRAP="lenny http://ftp.de.debian.org/debian"
+# FAI_DEBOOTSTRAP="lenny http://cdn.debian.net/debian"
 
 # Do you want to use a local mirror (like NFS) as well?
 # If so specify the directory where debian/ is available:

diff --git a/examples/mkdebmirror b/examples/mkdebmirror
index c8e255a..915a986 100644 (file)
--- a/examples/mkdebmirror
+++ b/examples/mkdebmirror
@@ -30,10 +30,10 @@ allopt="$debug --ignore-missing-release --ignore-release-gpg --passive --nosourc
 # first sync from a mirror near to you!
 # please ask the mirror admin(s) for permission before downloading
 # several GB of data!
-update_from ftp.de.debian.org
+update_from cdn.debian.net
 
 # since this mirror is not always up to date, sync the rest from an official mirror
-# update_from ftp.de.debian.org
+# update_from cdn.debian.net
 
 # even one should not mirror the security site, but I will do it.
 echo "------------------ create mirror for debian-security ------------------"

diff --git a/examples/reprepro/conf/updates b/examples/reprepro/conf/updates
index f544c62..cdf72bc 100644 (file)
--- a/examples/reprepro/conf/updates
+++ b/examples/reprepro/conf/updates
@@ -1,4 +1,4 @@
 Name: debian
-Method: http://ftp.de.debian.org/debian/
+Method: http://cdn.debian.net/debian/
 # Method: http://localhost/debian/
 # Fallback: http://snapshot.debian.net/archive/2007/04/02/debian/