I was just reminded about the Debian services to dynamically find the
closest Debian mirror using DNS, and started to wonder if we should
switch to this one in Debian Edu as well.

See <URL: http://lists.debian.org/debian-devel/2008/02/msg00700.html >
for background information.

This is the needed patch for debian-edu-config (might need changes to
debian-edu-install as well).  Should I apply it?  Any comments,
suggestions, objections, etc?

Index: cf/cf.apt
===================================================================
--- cf/cf.apt   (revision 67378)
+++ cf/cf.apt   (working copy)
@@ -3,14 +3,14 @@
   debian::

     { /etc/apt/sources.list
-      AppendIfNoSuchLine "#deb http://security.debian.org/ squeeze/updates 
main contrib non-free"
+      AppendIfNoSuchLine "#deb http://security.debian.org squeeze/updates main 
contrib non-free"
       AppendIfNoSuchLine "### Use (by uncommenting) either http or ftp, NOT 
both"
       AppendIfNoSuchLine "### http based apt source: ----------------"
-      AppendIfNoSuchLine "# deb http://ftp.debian.org/debian/ squeeze main 
contrib non-free"
-      AppendIfNoSuchLine "# deb http://ftp.skolelinux.org/skolelinux/ squeeze 
local"
+      AppendIfNoSuchLine "# deb http://cdn.debian.net/debian squeeze main 
contrib non-free"
+      AppendIfNoSuchLine "# deb http://ftp.skolelinux.org/skolelinux squeeze 
local"
       AppendIfNoSuchLine "### ftp based apt source: -----------------"
-      AppendIfNoSuchLine "# deb ftp://ftp.debian.org/debian/ squeeze main 
contrib non-free"
-      AppendIfNoSuchLine "# deb ftp://ftp.skolelinux.org/skolelinux/ squeeze 
local"
+      AppendIfNoSuchLine "# deb ftp://cdn.debian.net/debian squeeze main 
contrib non-free"
+      AppendIfNoSuchLine "# deb ftp://ftp.skolelinux.org/skolelinux squeeze 
local"
       AppendIfNoSuchLine "#"
       AppendIfNoSuchLine "# Volatile Sources, read http://volatile.debian.net/ 
for details"
       AppendIfNoSuchLine "# deb http://volatile.debian.net/debian-volatile 
squeeze/volatile main contrib non-free"
@@ -19,14 +19,14 @@
   debian.ltspserver::
     # A copy of the above
     { /opt/ltsp/$(ltsp_arch)/etc/apt/sources.list
-      AppendIfNoSuchLine "#deb http://security.debian.org/ squeeze/updates 
main contrib non-free"
+      AppendIfNoSuchLine "#deb http://security.debian.org squeeze/updates main 
contrib non-free"
       AppendIfNoSuchLine "### Use (by uncommenting) either http or ftp, NOT 
both"
       AppendIfNoSuchLine "### http based apt source: ----------------"
-      AppendIfNoSuchLine "#deb http://ftp.debian.org/debian/ squeeze main 
contrib non-free"
-      AppendIfNoSuchLine "#deb http://ftp.skolelinux.org/skolelinux/ squeeze 
local"
+      AppendIfNoSuchLine "#deb http://cdn.debian.net/debian squeeze main 
contrib non-free"
+      AppendIfNoSuchLine "#deb http://ftp.skolelinux.org/skolelinux squeeze 
local"
       AppendIfNoSuchLine "### ftp based apt source: -----------------"
-      AppendIfNoSuchLine "#deb ftp://ftp.debian.org/debian/ squeeze main 
contrib non-free"
-      AppendIfNoSuchLine "#deb ftp://ftp.skolelinux.org/skolelinux/ squeeze 
local"
+      AppendIfNoSuchLine "#deb ftp://cdn.debian.net/debian squeeze main 
contrib non-free"
+      AppendIfNoSuchLine "#deb ftp://ftp.skolelinux.org/skolelinux squeeze 
local"
       AppendIfNoSuchLine "#"
       AppendIfNoSuchLine "### Volatile Sources, read 
http://volatile.debian.net/ for details"
       AppendIfNoSuchLine "#deb http://volatile.debian.net/debian-volatile 
squeeze/volatile main contrib non-free"
Index: sbin/debian-edu-ltsp
===================================================================
--- sbin/debian-edu-ltsp        (revision 67378)
+++ sbin/debian-edu-ltsp        (working copy)
@@ -52,7 +52,7 @@
   securitymirror=""
   extramirror=""
 else
-  mirror=http://ftp.debian.org/debian
+  mirror=http://cdn.debian.net/debian
   extramirror="http://ftp.skolelinux.no/skolelinux $dist local"
   securitymirror="http://security.debian.org/ $dist/updates main contrib"
   components="main contrib"
Index: sbin/debian-edu-pxeinstall
===================================================================
--- sbin/debian-edu-pxeinstall  (revision 67378)
+++ sbin/debian-edu-pxeinstall  (working copy)
@@ -25,7 +25,7 @@

 [ "$dist" ]      || dist=$(lsb_release -s -c)
 [ "$archs" ]     || archs="i386 amd64"
-[ "$mirrorurl" ] || mirrorurl=http://ftp.skolelinux.org/debian
+[ "$mirrorurl" ] || mirrorurl=http://cdn.debian.net/debian
 [ "$archiveurl" ] || archiveurl=http://ftp.skolelinux.org/skolelinux
 [ "$hostname" ]  || hostname=pxeinstall
 [ "$domain" ]    || domain=intern
@@ -187,7 +187,7 @@
 # Avoid questions about mirrors, using manual setup
 choose-mirror-bin     mirror/country          string  manual
 choose-mirror-bin     mirror/protocol select  http
-choose-mirror-bin     mirror/http/hostname    string  ftp.skolelinux.org
+choose-mirror-bin     mirror/http/hostname    string  cdn.debian.net
 choose-mirror-bin     mirror/http/directory   string  /debian
 EOF
     else

Happy hacking,
-- 
Petter Reinholdtsen


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]

Reply via email to