Revert "Replace cdn.debian.net with http.debian.net"

This reverts commit 0533a725f51aa9759cf12312cff52a50756ba47e.
"E: Method gave invalid 200 URI Start message" seems to be
related to http.debian.net

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 41f36da..df23631 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -538,7 +538,7 @@ Instructions
   # CHROOT_INSTALL="/etc/grml/fai/chroot_install"
   ## adjust if necessary (defaults to /grml/grml-live):
   ## OUTPUT="/srv/grml-live"
-  FAI_DEBOOTSTRAP="wheezy http://http.debian.net/debian/"
+  FAI_DEBOOTSTRAP="wheezy http://cdn.debian.net/debian/"
   # ARCH="amd64"
   CLASSES="GRMLBASE,GRML_FULL,AMD64"
   EOF
@@ -651,7 +651,7 @@ How do I create a base.tgz?
 First of all create the chroot using debootstrap:
 
   BASECHROOT='/tmp/basefile'
-  debootstrap squeeze "$BASECHROOT" http://http.debian.net/debian
+  debootstrap squeeze "$BASECHROOT" http://cdn.debian.net/debian
   tar -C "$BASECHROOT" --exclude='var/cache/apt/archives/*.deb' -zcf base.tar.gz ./
 
 [TIP]
@@ -684,7 +684,7 @@ FAI_DEBOOTSTRAP:
   [...]
   APT_PROXY="http://localhost:3142/"
   [...]
-  FAI_DEBOOTSTRAP="squeeze http://localhost:3142/http.debian.net/debian squeeze main contrib non-free"
+  FAI_DEBOOTSTRAP="squeeze http://localhost:3142/cdn.debian.net/debian squeeze main contrib non-free"
 
 Make sure apt-cacher-ng is running ('/etc/init.d/apt-cacher-ng restart').
 That's it.  All downloaded files will be cached in /var/cache/apt-cacher-ng then.

diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_ETCH b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_ETCH
index 7800fc5..1ece67b 100644 (file)
--- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_ETCH
+++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_ETCH
@@ -1,6 +1,6 @@
-# official debian repository:
-  deb     http://http.debian.net/debian/ etch main contrib non-free
-  deb-src http://http.debian.net/debian/ etch main contrib non-free
+# official debian repository (mirror selected via geo-ip):
+  deb     http://cdn.debian.net/debian/ etch main contrib non-free
+  deb-src http://cdn.debian.net/debian/ etch main contrib non-free
 
 # official debian repository:
 #  deb     http://ftp.debian.org/debian/ etch main contrib non-free

diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY
index 7a904d2..b6ced67 100644 (file)
--- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY
+++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_LENNY
@@ -1,6 +1,6 @@
-# official debian repository:
-  deb     http://http.debian.net/debian/ lenny main contrib non-free
-  deb-src http://http.debian.net/debian/ lenny main contrib non-free
+# official debian repository (mirror selected via geo-ip):
+  deb     http://cdn.debian.net/debian/ lenny main contrib non-free
+  deb-src http://cdn.debian.net/debian/ lenny main contrib non-free
 
 # security updates:
   deb     http://security.debian.org/ lenny/updates main contrib

diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID
index 5f6d8ac..332a6e7 100644 (file)
--- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID
+++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SID
@@ -1,6 +1,6 @@
-# official debian repository:
-  deb     http://http.debian.net/debian/ sid main contrib non-free
-  deb-src http://http.debian.net/debian/ sid main contrib non-free
+# official debian repository (mirror selected via geo-ip):
+  deb     http://cdn.debian.net/debian/ sid main contrib non-free
+  deb-src http://cdn.debian.net/debian/ sid main contrib non-free
 
 # official debian repository:
 #  deb     http://ftp.debian.org/debian/ sid main contrib non-free

diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE
index 14c9406..c7d9f91 100644 (file)
--- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE
+++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_SQUEEZE
@@ -1,6 +1,6 @@
-# official debian repository:
-  deb     http://http.debian.net/debian/ squeeze main contrib non-free
-  deb-src http://http.debian.net/debian/ squeeze main contrib non-free
+# official debian repository (mirror selected via geo-ip):
+  deb     http://cdn.debian.net/debian/ squeeze main contrib non-free
+  deb-src http://cdn.debian.net/debian/ squeeze main contrib non-free
 
 # security updates:
   deb     http://security.debian.org/ squeeze/updates main contrib

diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STABLE b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STABLE
index bd35b3b..f88eba7 100644 (file)
--- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STABLE
+++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_STABLE
@@ -1,6 +1,6 @@
-# official debian repository:
-  deb     http://http.debian.net/debian/ stable main contrib non-free
-  deb-src http://http.debian.net/debian/ stable main contrib non-free
+# official debian repository (mirror selected via geo-ip):
+  deb     http://cdn.debian.net/debian/ stable main contrib non-free
+  deb-src http://cdn.debian.net/debian/ stable main contrib non-free
 
 # security updates:
   deb     http://security.debian.org/ stable/updates main contrib

diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING
index 7a1d96d..33dc13e 100644 (file)
--- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING
+++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_TESTING
@@ -1,6 +1,6 @@
-# official debian repository:
-  deb     http://http.debian.net/debian/ testing main contrib non-free
-  deb-src http://http.debian.net/debian/ testing main contrib non-free
+# official debian repository (mirror selected via geo-ip):
+  deb     http://cdn.debian.net/debian/ testing main contrib non-free
+  deb-src http://cdn.debian.net/debian/ testing main contrib non-free
 
 # security updates:
   deb     http://security.debian.org/ testing/updates main contrib

diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE
index 760baa0..d2d15f6 100644 (file)
--- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE
+++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_UNSTABLE
@@ -1,6 +1,6 @@
-# official debian repository:
-  deb     http://http.debian.net/debian/ unstable main contrib non-free
-  deb-src http://http.debian.net/debian/ unstable main contrib non-free
+# official debian repository (mirror selected via geo-ip):
+  deb     http://cdn.debian.net/debian/ unstable main contrib non-free
+  deb-src http://cdn.debian.net/debian/ unstable main contrib non-free
 
 # official debian repository:
 #  deb     http://ftp.debian.org/debian/ unstable main contrib non-free

diff --git a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY
index e2b2bc4..d850455 100644 (file)
--- a/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY
+++ b/etc/grml/fai/config/files/etc/apt/sources.list.d/debian.list/DEBIAN_WHEEZY
@@ -1,6 +1,6 @@
-# official debian repository:
-  deb     http://http.debian.net/debian/ wheezy main contrib non-free
-  deb-src http://http.debian.net/debian/ wheezy main contrib non-free
+# official debian repository (mirror selected via geo-ip):
+  deb     http://cdn.debian.net/debian/ wheezy main contrib non-free
+  deb-src http://cdn.debian.net/debian/ wheezy main contrib non-free
 
 # security updates:
   deb     http://security.debian.org/ wheezy/updates main contrib

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
index 678b42b..39af509 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
@@ -11,7 +11,7 @@ set -e
 # use snapshot.debian.org based on build date for release
 if ifclass RELEASE ; then
   set -u
-  perl -pi -e 'BEGIN { $d="'$(date +%Y%m%d)'"; } s#^(\s+)(deb.* )(.*://http.debian.net.*?)\s+(\w+)\s+(.*)$#$1$2http://snapshot.debian.org/archive/debian/$d/ $4 $5#' \
+  perl -pi -e 'BEGIN { $d="'$(date +%Y%m%d)'"; } s#^(\s+)(deb.* )(.*://cdn.*?)\s+(\w+)\s+(.*)$#$1$2http://snapshot.debian.org/archive/debian/$d/ $4 $5#' \
     "${target}/etc/apt/sources.list.d/debian.list"
 
 fi

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 7f47acd..5381688 100644 (file)
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -66,7 +66,7 @@
 
 # Which Debian suite and which mirror do you want to use for debootstrapping?
 # Usage: "<suite> <mirror>"
-# FAI_DEBOOTSTRAP="squeeze http://http.debian.net/debian"
+# FAI_DEBOOTSTRAP="squeeze http://cdn.debian.net/debian"
 
 # Do you want to use a local mirror (like NFS)?
 # If so specify the directory where debian/ is available:

diff --git a/examples/mkdebmirror b/examples/mkdebmirror
index c010592..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 http.debian.net
+update_from cdn.debian.net
 
 # since this mirror is not always up to date, sync the rest from an official mirror
-# update_from http.debian.net
+# 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 00ac330..cdf72bc 100644 (file)
--- a/examples/reprepro/conf/updates
+++ b/examples/reprepro/conf/updates
@@ -1,4 +1,4 @@
 Name: debian
-Method: http://http.debian.net/debian/
+Method: http://cdn.debian.net/debian/
 # Method: http://localhost/debian/
 # Fallback: http://snapshot.debian.net/archive/2007/04/02/debian/

diff --git a/grml-live b/grml-live
index 49df530..45b93e6 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -617,7 +617,7 @@ fi
 
 # generate nfsroot configuration for FAI on the fly
 if [ -z "$FAI_DEBOOTSTRAP" ] ; then
-  FAI_DEBOOTSTRAP="$SUITE http://http.debian.net/debian"
+  FAI_DEBOOTSTRAP="$SUITE http://cdn.debian.net/debian"
 fi
 
 if [ -z "$FAI_DEBOOTSTRAP_OPTS" ] ; then

diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
index ce7a108..d652778 100644 (file)
--- a/templates/GRML/grml-cheatcodes.txt
+++ b/templates/GRML/grml-cheatcodes.txt
@@ -249,12 +249,12 @@ debian2hd <options>                 ... whereas valid options for debian2hd are:
   target=       target partition/directory of the new Debian system, e.g.: target=/dev/sda1
   grub=         where to install grub to, e.g.: grub=/dev/sda
   release=      specify release of new Debian system (default is stable), e.g.: release=sid
-  mirror=       specify mirror for apt-get/aptitude, e,g.: mirror=http://http.debian.net/debian
+  mirror=       specify mirror for apt-get/aptitude, e,g.: mirror=http://cdn.debian.net/debian
   password=     set passwort of user root without prompting for it, e.g.: password=AiTh5ahn
 
   Usage example for automatic installation:
 
-    debian2hd target=/dev/sda1 grub=/dev/sda mirror=http://http.debian.net/debian password=foobar
+    debian2hd target=/dev/sda1 grub=/dev/sda mirror=http://cdn.debian.net/debian password=foobar
 
   See http://grml.org/grml-debootstrap/ for more information.