[debian-edu-commits] r80556 - in branches/wheezy/debian-edu-config: cf debian sbin

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-13 09:03:24 +0000 (Thu, 13 Jun 2013)
New Revision: 80556

Modified:
   branches/wheezy/debian-edu-config/cf/cf.apt
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/sbin/debian-edu-ltsp
   branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
Log:
Switch default APT source, fallback LTSP mirror and fallback PXE
mirror from ftp.skolelinux.org, ftp.debian.org and cdn.debian.net
to http.debian.net, to pick a nearby mirror in the most efficient
way available today.

Modified: branches/wheezy/debian-edu-config/cf/cf.apt
===================================================================
--- branches/wheezy/debian-edu-config/cf/cf.apt	2013-06-13 09:02:27 UTC (rev 80555)
+++ branches/wheezy/debian-edu-config/cf/cf.apt	2013-06-13 09:03:24 UTC (rev 80556)
@@ -8,7 +8,7 @@
       AppendIfNoSuchLine "deb http://security.debian.org/ wheezy/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/ wheezy main contrib non-free"
+      AppendIfNoSuchLine "deb http://http.debian.net/debian wheezy main contrib non-free"
       AppendIfNoSuchLine "### ftp based apt source: -----------------"
       AppendIfNoSuchLine "# deb ftp://ftp.debian.org/debian/ wheezy main contrib non-free"
       AppendIfNoSuchLine "# deb ftp://ftp.skolelinux.org/skolelinux/ wheezy local"
@@ -22,7 +22,7 @@
       AppendIfNoSuchLine "deb http://security.debian.org/ wheezy/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/ wheezy main contrib non-free"
+      AppendIfNoSuchLine "deb http://http.debian.net/debian wheezy main contrib non-free"
       AppendIfNoSuchLine "### ftp based apt source: -----------------"
       AppendIfNoSuchLine "#deb ftp://ftp.debian.org/debian/ wheezy main contrib non-free"
       AppendIfNoSuchLine "#deb ftp://ftp.skolelinux.org/skolelinux/ wheezy local"

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-13 09:02:27 UTC (rev 80555)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-13 09:03:24 UTC (rev 80556)
@@ -1,3 +1,12 @@
+debian-edu-config (1.707~svn80552) UNRELEASED; urgency=low
+
+  * Switch default APT source, fallback LTSP mirror and fallback PXE
+    mirror from ftp.skolelinux.org, ftp.debian.org and cdn.debian.net
+    to http.debian.net, to pick a nearby mirror in the most efficient
+    way available today.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Thu, 13 Jun 2013 10:57:58 +0200
+
 debian-edu-config (1.707~svn80551) wheezy-test; urgency=low
 
   * Adjust webcache testsuite check, and remove now obsolete argument

Modified: branches/wheezy/debian-edu-config/sbin/debian-edu-ltsp
===================================================================
--- branches/wheezy/debian-edu-config/sbin/debian-edu-ltsp	2013-06-13 09:02:27 UTC (rev 80555)
+++ branches/wheezy/debian-edu-config/sbin/debian-edu-ltsp	2013-06-13 09:03:24 UTC (rev 80556)
@@ -52,7 +52,7 @@
   securitymirror=""
   extramirror=""
 else
-  mirror=http://ftp.debian.org/debian
+  mirror=http://http.debian.net/debian
   extramirror="http://ftp.skolelinux.no/skolelinux $dist local"
   securitymirror="http://security.debian.org/ $dist/updates main contrib"
   components="main contrib"

Modified: branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall
===================================================================
--- branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-06-13 09:02:27 UTC (rev 80555)
+++ branches/wheezy/debian-edu-config/sbin/debian-edu-pxeinstall	2013-06-13 09:03:24 UTC (rev 80556)
@@ -55,7 +55,7 @@
 
 [ "$dist" ]      || dist=$(lsb_release -s -c)
 [ "$archs" ]     || archs="i386 amd64"
-[ "$mirrorurl" ] || mirrorurl=http://ftp.skolelinux.org/debian
+[ "$mirrorurl" ] || mirrorurl=http://http.debian.net/debian
 [ "$archiveurl" ] || archiveurl=http://ftp.skolelinux.org/skolelinux
 [ "$hostname" ]  || hostname=pxeinstall
 [ "$domain" ]    || domain=intern
@@ -230,7 +230,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  cdn.debian.net
+choose-mirror-bin     mirror/http/hostname    string  http.debian.net
 choose-mirror-bin     mirror/http/directory   string  /debian
 EOF
     else