[debian-edu-commits] debian-edu/ 01/01: Use httpredir.debian.org instead of http.debian.net as mirror redirector.

[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 54a0be1ce0d3b2f2b880f91fc64460042b5a39b2
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun May 15 23:27:50 2016 +0200

    Use httpredir.debian.org instead of http.debian.net as mirror redirector.
---
 cf/cf.apt                  | 4 ++--
 debian/changelog           | 1 +
 sbin/debian-edu-hwsetup    | 2 +-
 sbin/debian-edu-ltsp       | 2 +-
 sbin/debian-edu-pxeinstall | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cf/cf.apt b/cf/cf.apt
index 80f25e5..182e8a3 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://http.debian.net/debian stretch main contrib non-free"
+      AppendIfNoSuchLine "deb http://httpredir.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://http.debian.net/debian stretch main contrib non-free"
+      AppendIfNoSuchLine "deb http://httpredir.debian.org/debian stretch main contrib non-free"
     }
 
 shellcommands:
diff --git a/debian/changelog b/debian/changelog
index 4d85edb..cda83b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,7 @@ debian-edu-config (1.901) UNRELEASED; urgency=medium
     - Move php-debian-edu.ini from etc/php5/ to etc/php/.
     - Adjust cf/cf.apache2.
     - Adjust Makefile.
+  * Use httpredir.debian.org instead of http.debian.net as mirror redirector.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 14 Apr 2016 23:32:10 +0200
 
diff --git a/sbin/debian-edu-hwsetup b/sbin/debian-edu-hwsetup
index 95647f6..53e9720 100755
--- a/sbin/debian-edu-hwsetup
+++ b/sbin/debian-edu-hwsetup
@@ -34,7 +34,7 @@ add_nonfree_pkg() {
     info "Installing non-free package $pkg from $codename."
     if ! LC_ALL=C apt-cache show $binpkg 2>&1 | \
                grep -q 'E: No packages found' ; then
-	echo deb http://http.debian.net/debian $codename non-free \
+	echo deb http://httpredir.debian.org/debian $codename non-free \
 	    > /etc/apt/sources.list.d/$pkg.list
 	chmod a+r /etc/apt/sources.list.d/$pkg.list
 	apt-get -qq update
diff --git a/sbin/debian-edu-ltsp b/sbin/debian-edu-ltsp
index a1c7a24..16c4875 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://http.debian.net/debian
+  mirror=http://httpredir.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 d7b9efb..55d4017 100755
--- a/sbin/debian-edu-pxeinstall
+++ b/sbin/debian-edu-pxeinstall
@@ -55,7 +55,7 @@ fi
 
 [ "$dist" ]      || dist=$(debian-edu-current-codename)
 [ "$archs" ]     || archs="i386 amd64"
-[ "$mirrorurl" ] || mirrorurl=http://http.debian.net/debian
+[ "$mirrorurl" ] || mirrorurl=http://httpredir.debian.org/debian
 [ "$archiveurl" ] || archiveurl=http://ftp.skolelinux.org/skolelinux
 [ "$hostname" ]  || hostname=pxeinstall
 [ "$domain" ]    || domain=intern
@@ -245,7 +245,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  http.debian.net
+choose-mirror-bin     mirror/http/hostname    string  httpredir.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