[debian-edu-commits] debian-edu/ 01/01: Use deb.debian.org instead of httpredir.debian.org as mirror redirector, now that deb.debian.org is the default for debootstrap; adjusted files: cf/cf.apt, sbin/debian-edu-ltsp, sbin/debian-edu-pxeinstall.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit 4727c97a7ee833cdb315f0d2151757fa50bb17ab
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Tue Nov 8 17:08:39 2016 +0100

    Use deb.debian.org instead of httpredir.debian.org as mirror redirector, now that deb.debian.org is the default for debootstrap; adjusted files: cf/cf.apt, sbin/debian-edu-ltsp, sbin/debian-edu-pxeinstall.
---
 cf/cf.apt                  |  4 ++--
 debian/changelog           | 10 ++++++++++
 sbin/debian-edu-ltsp       |  2 +-
 sbin/debian-edu-pxeinstall |  4 ++--
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/cf/cf.apt b/cf/cf.apt
index b577981..c48b4c0 100644
--- a/cf/cf.apt
+++ b/cf/cf.apt
@@ -6,7 +6,7 @@ editfiles:
       HashCommentLinesStarting "deb cdrom:"
       HashCommentLinesStarting "deb http://security.debian.org/ stretch/updates main"
       AppendIfNoSuchLine "deb http://security.debian.org/ stretch/updates main contrib non-free"
-      AppendIfNoSuchLine "deb http://httpredir.debian.org/debian stretch main contrib non-free"
+      AppendIfNoSuchLine "deb http://deb.debian.org/debian stretch main contrib non-free"
     }
 
   debian.ltspserver::
@@ -15,7 +15,7 @@ editfiles:
       HashCommentLinesStarting "deb file:"
       HashCommentLinesStarting "deb http://security.debian.org/ stretch/updates main"
       AppendIfNoSuchLine "deb http://security.debian.org/ stretch/updates main contrib non-free"
-      AppendIfNoSuchLine "deb http://httpredir.debian.org/debian stretch main contrib non-free"
+      AppendIfNoSuchLine "deb http://deb.debian.org/debian stretch main contrib non-free"
     }
 
 
diff --git a/debian/changelog b/debian/changelog
index 54abad3..e6b8cc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debian-edu-config (1.918) UNRELEASED; urgency=medium
+
+  * Use deb.debian.org instead of httpredir.debian.org as mirror redirector,
+    now that deb.debian.org is the default for debootstrap; adjusted files:
+    - cf/cf.apt
+    - sbin/debian-edu-ltsp
+    - sbin/debian-edu-pxeinstall
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 08 Nov 2016 17:01:53 +0100
+
 debian-edu-config (1.917) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/sbin/debian-edu-ltsp b/sbin/debian-edu-ltsp
index 9eec85b..82a5fc1 100644
--- a/sbin/debian-edu-ltsp
+++ b/sbin/debian-edu-ltsp
@@ -52,7 +52,7 @@ if apt-cache policy ltsp-client | grep -q "cdrom://" ; then
   securitymirror=""
   extramirror=""
 else
-  mirror=http://httpredir.debian.org/debian
+  mirror=http://deb.debian.org/debian
   extramirror=""
   securitymirror="http://security.debian.org/ $dist/updates main contrib"
   components="main contrib"
diff --git a/sbin/debian-edu-pxeinstall b/sbin/debian-edu-pxeinstall
index e48f0e0..97436a1 100755
--- a/sbin/debian-edu-pxeinstall
+++ b/sbin/debian-edu-pxeinstall
@@ -55,7 +55,7 @@ fi
 
 [ "$dist" ]      || dist=$(lsb_release -sc)
 [ "$archs" ]     || archs="i386 amd64"
-[ "$mirrorurl" ] || mirrorurl=http://httpredir.debian.org/debian
+[ "$mirrorurl" ] || mirrorurl=http://deb.debian.org/debian
 [ "$hostname" ]  || hostname=pxeinstall
 [ "$domain" ]    || domain=intern
 # Not hardcoded to allow PXE installation of a main-server without a
@@ -222,7 +222,7 @@ cat <<EOF
 choose-mirror-bin     mirror/country          string  manual
 choose-mirror-bin     mirror/protocol select  http
 choose-mirror-bin     mirror/http/mirror      select
-choose-mirror-bin     mirror/http/hostname    string  httpredir.debian.org
+choose-mirror-bin     mirror/http/hostname    string  deb.debian.org
 choose-mirror-bin     mirror/http/directory   string  /debian
 EOF
     else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git