projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
071465c
)
Get rid of always broken http.d.net
author
Peter Palfrader
<peter@palfrader.org>
Wed, 28 Jan 2015 17:30:31 +0000
(18:30 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Wed, 28 Jan 2015 17:30:31 +0000
(18:30 +0100)
modules/schroot/files/schroot-dsa/config
patch
|
blob
|
history
modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
patch
|
blob
|
history
modules/schroot/files/setup-dchroot
patch
|
blob
|
history
modules/schroot/templates/default-mirror.erb
patch
|
blob
|
history
diff --git
a/modules/schroot/files/schroot-dsa/config
b/modules/schroot/files/schroot-dsa/config
index
d2cc368
..
688f8b6
100644
(file)
--- a/
modules/schroot/files/schroot-dsa/config
+++ b/
modules/schroot/files/schroot-dsa/config
@@
-43,7
+43,7
@@
CHROOT_FILE_UNPACK_DIR=/srv/chroot/schroot-unpack
if [ -e /etc/schroot/dsa/default-mirror ]; then
MIRROR=$(cat /etc/schroot/dsa/default-mirror )
fi
if [ -e /etc/schroot/dsa/default-mirror ]; then
MIRROR=$(cat /etc/schroot/dsa/default-mirror )
fi
-MIRROR=${MIRROR:-
http.debian.net
}
+MIRROR=${MIRROR:-
ftp.debian.org
}
if [ "$(basename "$0")" = "00check" ] &&
[ "$CHROOT_TYPE" = "file" ] &&
if [ "$(basename "$0")" = "00check" ] &&
[ "$CHROOT_TYPE" = "file" ] &&
diff --git
a/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
b/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
index
a65532e
..
08dab86
100755
(executable)
--- a/
modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
+++ b/
modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
@@
-26,7
+26,7
@@
fi
if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
SRCL="${CHROOT_PATH}/etc/apt/sources.list.d/auto.list"
rm -f "$SRCL"
if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
SRCL="${CHROOT_PATH}/etc/apt/sources.list.d/auto.list"
rm -f "$SRCL"
- mirror=${MIRROR:-http://
http.debian.net
/debian}
+ mirror=${MIRROR:-http://
ftp.debian.org
/debian}
case "${SUITE_BASE:-}" in
experimental)
case "${SUITE_BASE:-}" in
experimental)
diff --git
a/modules/schroot/files/setup-dchroot
b/modules/schroot/files/setup-dchroot
index
998ad41
..
24a1857
100755
(executable)
--- a/
modules/schroot/files/setup-dchroot
+++ b/
modules/schroot/files/setup-dchroot
@@
-150,7
+150,7
@@
arch="$THISARCH"
if [ -e /etc/schroot/dsa/default-mirror ]; then
mirror=$(cat /etc/schroot/dsa/default-mirror )
fi
if [ -e /etc/schroot/dsa/default-mirror ]; then
mirror=$(cat /etc/schroot/dsa/default-mirror )
fi
-mirror="${mirror:-http://
http.debian.net
/debian}"
+mirror="${mirror:-http://
ftp.debian.org
/debian}"
configonly=""
force=""
basedir="/srv/chroot"
configonly=""
force=""
basedir="/srv/chroot"
diff --git
a/modules/schroot/templates/default-mirror.erb
b/modules/schroot/templates/default-mirror.erb
index
0208890
..
48d680f
100644
(file)
--- a/
modules/schroot/templates/default-mirror.erb
+++ b/
modules/schroot/templates/default-mirror.erb
@@
-3,6
+3,6
@@
ninfo = scope.lookupvar('site::nodeinfo')
if ninfo['hoster'].has_key?('mirror-debian') then
ninfo['hoster']['mirror-debian']
else
if ninfo['hoster'].has_key?('mirror-debian') then
ninfo['hoster']['mirror-debian']
else
- 'http://
http.debian.net
/debian'
+ 'http://
ftp.debian.org
/debian'
end
%>
end
%>