[debian-lan-devel] [debian-lan] 02/05: Switch from http.debian.net to httpredir.debian.org.
Andreas B. Mundt
andi at moszumanska.debian.org
Thu May 28 14:29:08 UTC 2015
This is an automated email from the git hooks/post-receive script.
andi pushed a commit to branch master
in repository debian-lan.
commit 93eab2a409b49f2f3bcfd0996797c7263ac6d8d1
Author: Andreas B. Mundt <andi at debian.org>
Date: Fri May 8 18:19:09 2015 +0200
Switch from http.debian.net to httpredir.debian.org.
---
fai/config/files/etc/apt/sources.list/CLIENT_A | 6 +++---
fai/config/files/etc/apt/sources.list/GATEWAY_A | 6 +++---
fai/config/files/etc/apt/sources.list/SERVER_A | 6 +++---
fai/config/files/etc/fai/apt/sources.list/SERVER_A | 6 +++---
fai/config/files/etc/fai/nfsroot.conf/FAISERVER | 2 +-
fai/config/files/etc/fai/nfsroot.conf/SERVER_A | 2 +-
fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER | 2 +-
fai/config/hooks/install.DEFAULT.source | 2 +-
fai/config/scripts/FAISERVER/50-di-netboot | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/fai/config/files/etc/apt/sources.list/CLIENT_A b/fai/config/files/etc/apt/sources.list/CLIENT_A
index cbfbf1c..8d6129e 100644
--- a/fai/config/files/etc/apt/sources.list/CLIENT_A
+++ b/fai/config/files/etc/apt/sources.list/CLIENT_A
@@ -1,6 +1,6 @@
-deb http://http.debian.net/debian/ jessie main
+deb http://httpredir.debian.org/debian/ jessie main
deb http://security.debian.org/ jessie/updates main
-deb http://http.debian.net/debian/ jessie-updates main
+deb http://httpredir.debian.org/debian/ jessie-updates main
## Backports repository:
-deb http://http.debian.net/debian/ jessie-backports main
+deb http://httpredir.debian.org/debian/ jessie-backports main
diff --git a/fai/config/files/etc/apt/sources.list/GATEWAY_A b/fai/config/files/etc/apt/sources.list/GATEWAY_A
index cbfbf1c..8d6129e 100644
--- a/fai/config/files/etc/apt/sources.list/GATEWAY_A
+++ b/fai/config/files/etc/apt/sources.list/GATEWAY_A
@@ -1,6 +1,6 @@
-deb http://http.debian.net/debian/ jessie main
+deb http://httpredir.debian.org/debian/ jessie main
deb http://security.debian.org/ jessie/updates main
-deb http://http.debian.net/debian/ jessie-updates main
+deb http://httpredir.debian.org/debian/ jessie-updates main
## Backports repository:
-deb http://http.debian.net/debian/ jessie-backports main
+deb http://httpredir.debian.org/debian/ jessie-backports main
diff --git a/fai/config/files/etc/apt/sources.list/SERVER_A b/fai/config/files/etc/apt/sources.list/SERVER_A
index cbfbf1c..8d6129e 100644
--- a/fai/config/files/etc/apt/sources.list/SERVER_A
+++ b/fai/config/files/etc/apt/sources.list/SERVER_A
@@ -1,6 +1,6 @@
-deb http://http.debian.net/debian/ jessie main
+deb http://httpredir.debian.org/debian/ jessie main
deb http://security.debian.org/ jessie/updates main
-deb http://http.debian.net/debian/ jessie-updates main
+deb http://httpredir.debian.org/debian/ jessie-updates main
## Backports repository:
-deb http://http.debian.net/debian/ jessie-backports main
+deb http://httpredir.debian.org/debian/ jessie-backports main
diff --git a/fai/config/files/etc/fai/apt/sources.list/SERVER_A b/fai/config/files/etc/fai/apt/sources.list/SERVER_A
index 5efd091..9cb4ebf 100644
--- a/fai/config/files/etc/fai/apt/sources.list/SERVER_A
+++ b/fai/config/files/etc/fai/apt/sources.list/SERVER_A
@@ -1,6 +1,6 @@
-deb http://http.debian.net/debian/ jessie main
+deb http://httpredir.debian.org/debian/ jessie main
deb http://security.debian.org/ stable/updates main
-deb http://http.debian.net/debian/ jessie-updates main
+deb http://httpredir.debian.org/debian/ jessie-updates main
## Backports repository:
-deb http://http.debian.net/debian/ jessie-backports main
+deb http://httpredir.debian.org/debian/ jessie-backports main
diff --git a/fai/config/files/etc/fai/nfsroot.conf/FAISERVER b/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
index 274baf8..7a9640b 100644
--- a/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
+++ b/fai/config/files/etc/fai/nfsroot.conf/FAISERVER
@@ -1,6 +1,6 @@
# For a detailed description see nfsroot.conf(5)
-FAI_DEBOOTSTRAP="jessie http://http.debian.net/debian"
+FAI_DEBOOTSTRAP="jessie http://httpredir.debian.org/debian"
FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
NFSROOT=/srv/fai/nfsroot
diff --git a/fai/config/files/etc/fai/nfsroot.conf/SERVER_A b/fai/config/files/etc/fai/nfsroot.conf/SERVER_A
index 274baf8..7a9640b 100644
--- a/fai/config/files/etc/fai/nfsroot.conf/SERVER_A
+++ b/fai/config/files/etc/fai/nfsroot.conf/SERVER_A
@@ -1,6 +1,6 @@
# For a detailed description see nfsroot.conf(5)
-FAI_DEBOOTSTRAP="jessie http://http.debian.net/debian"
+FAI_DEBOOTSTRAP="jessie http://httpredir.debian.org/debian"
FAI_ROOTPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
NFSROOT=/srv/fai/nfsroot
diff --git a/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER b/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER
index ade92d5..ee09fd4 100755
--- a/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER
+++ b/fai/config/files/usr/local/sbin/debian-lan-chroots/FAISERVER
@@ -7,7 +7,7 @@ umask 0022
export http_proxy="http://aptcache:3128"
############################
-URL="http.debian.net"
+URL="httpredir.debian.org"
INSTALLER="/usr/lib/debian-installer/images/*/*/text/debian-installer/"
DLROOT="/opt/live"
diff --git a/fai/config/hooks/install.DEFAULT.source b/fai/config/hooks/install.DEFAULT.source
index b17d79a..8097e9c 100755
--- a/fai/config/hooks/install.DEFAULT.source
+++ b/fai/config/hooks/install.DEFAULT.source
@@ -3,7 +3,7 @@
# Check if network is available.
#
-URL="http://http.debian.net/"
+URL="http://httpredir.debian.org/"
while ! wget --quiet --output-document=/tmp/network-check $URL ; do
echo "Error accessing '$URL', check network and internet access."
if ! { dialog --stdout --backtitle " No network/internet access! " \
diff --git a/fai/config/scripts/FAISERVER/50-di-netboot b/fai/config/scripts/FAISERVER/50-di-netboot
index 0f83e3f..54cfa23 100755
--- a/fai/config/scripts/FAISERVER/50-di-netboot
+++ b/fai/config/scripts/FAISERVER/50-di-netboot
@@ -56,7 +56,7 @@ d-i netcfg/get_domain string unassigned-domain
d-i netcfg/wireless_wep string
### Mirror settings
d-i mirror/country string manual
-d-i mirror/http/hostname string http.debian.net
+d-i mirror/http/hostname string httpredir.debian.org
d-i mirror/http/directory string /debian
d-i mirror/http/proxy string http://aptcache.intern:3128/
### Account setup
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git
More information about the debian-lan-devel
mailing list