TT#5444 Support http-only Debian mirrors via debianrepotransport boot option

Debian mirror doesn't support https sometimes, like ftp.de.debian.org

Previously we were not able to use different transports for
Debian and Sipwise repositories. Now we can do it using
boot option 'debianrepotransport'.

Change-Id: Iec43e9831dba37475edc0c42ab32f6e41051c79d
changes/10/9410/3
Alexander Lutay 9 years ago
parent ba06d2b145
commit d8b509407c

@ -74,6 +74,7 @@ ADJUST_FOR_LOW_PERFORMANCE=false
ENABLE_VM_SERVICES=false ENABLE_VM_SERVICES=false
FILESYSTEM="ext4" FILESYSTEM="ext4"
DEBIAN_REPO_HOST="debian.sipwise.com" DEBIAN_REPO_HOST="debian.sipwise.com"
DEBIAN_REPO_TRANSPORT="https"
SIPWISE_REPO_HOST="deb.sipwise.com" SIPWISE_REPO_HOST="deb.sipwise.com"
SIPWISE_REPO_TRANSPORT="https" SIPWISE_REPO_TRANSPORT="https"
DPL_MYSQL_REPLICATION=true DPL_MYSQL_REPLICATION=true
@ -252,7 +253,7 @@ install_vbox_package() {
local TMPDIR=$(mktemp -d) local TMPDIR=$(mktemp -d)
mkdir -p "${TMPDIR}/etc/preferences.d" "${TMPDIR}/statedir/lists/partial" \ mkdir -p "${TMPDIR}/etc/preferences.d" "${TMPDIR}/statedir/lists/partial" \
"${TMPDIR}/cachedir/archives/partial" "${TMPDIR}/cachedir/archives/partial"
echo "deb ${SIPWISE_REPO_TRANSPORT}://${DEBIAN_REPO_HOST}/debian/ ${DEBIAN_RELEASE} non-free" > \ echo "deb ${DEBIAN_REPO_TRANSPORT}://${DEBIAN_REPO_HOST}/debian/ ${DEBIAN_RELEASE} non-free" > \
"${TMPDIR}/etc/sources.list" "${TMPDIR}/etc/sources.list"
DEBIAN_FRONTEND='noninteractive' apt-get -o dir::cache="${TMPDIR}/cachedir" \ DEBIAN_FRONTEND='noninteractive' apt-get -o dir::cache="${TMPDIR}/cachedir" \
@ -635,6 +636,10 @@ if checkBootParam ngcpppainstaller ; then
NGCP_PPA_INSTALLER=$(getBootParam ngcpppainstaller) NGCP_PPA_INSTALLER=$(getBootParam ngcpppainstaller)
fi fi
if checkBootParam debianrepotransport ; then
DEBIAN_REPO_TRANSPORT=$(getBootParam debianrepotransport)
fi
if checkBootParam sipwiserepotransport ; then if checkBootParam sipwiserepotransport ; then
SIPWISE_REPO_TRANSPORT=$(getBootParam sipwiserepotransport) SIPWISE_REPO_TRANSPORT=$(getBootParam sipwiserepotransport)
fi fi
@ -1277,8 +1282,8 @@ fi
# NOTE: we use the debian.sipwise.com CNAME by intention here # NOTE: we use the debian.sipwise.com CNAME by intention here
# to avoid conflicts with apt-pinning, preferring deb.sipwise.com # to avoid conflicts with apt-pinning, preferring deb.sipwise.com
# over official Debian # over official Debian
MIRROR="${SIPWISE_REPO_TRANSPORT}://${DEBIAN_REPO_HOST}/debian/" MIRROR="${DEBIAN_REPO_TRANSPORT}://${DEBIAN_REPO_HOST}/debian/"
SEC_MIRROR="${SIPWISE_REPO_TRANSPORT}://${DEBIAN_REPO_HOST}/debian-security/" SEC_MIRROR="${DEBIAN_REPO_TRANSPORT}://${DEBIAN_REPO_HOST}/debian-security/"
KEYRING='/etc/apt/trusted.gpg.d/sipwise.gpg' KEYRING='/etc/apt/trusted.gpg.d/sipwise.gpg'
set_deploy_status "debootstrap" set_deploy_status "debootstrap"
@ -1294,7 +1299,7 @@ EOF
if [ -n "$PUPPET" ] ; then if [ -n "$PUPPET" ] ; then
cat >> /etc/debootstrap/etc/apt/sources.list << EOF cat >> /etc/debootstrap/etc/apt/sources.list << EOF
deb ${SIPWISE_REPO_TRANSPORT}://${DEBIAN_REPO_HOST}/puppetlabs/ ${DEBIAN_RELEASE} main PC1 dependencies deb ${DEBIAN_REPO_TRANSPORT}://${DEBIAN_REPO_HOST}/puppetlabs/ ${DEBIAN_RELEASE} main PC1 dependencies
EOF EOF
fi fi
@ -1614,6 +1619,7 @@ SKIP_SOURCES_LIST="${SKIP_SOURCES_LIST}"
ADJUST_FOR_LOW_PERFORMANCE="${ADJUST_FOR_LOW_PERFORMANCE}" ADJUST_FOR_LOW_PERFORMANCE="${ADJUST_FOR_LOW_PERFORMANCE}"
ENABLE_VM_SERVICES="${ENABLE_VM_SERVICES}" ENABLE_VM_SERVICES="${ENABLE_VM_SERVICES}"
SIPWISE_REPO_HOST="${SIPWISE_REPO_HOST}" SIPWISE_REPO_HOST="${SIPWISE_REPO_HOST}"
DEBIAN_REPO_TRANSPORT="${DEBIAN_REPO_TRANSPORT}"
SIPWISE_REPO_TRANSPORT="${SIPWISE_REPO_TRANSPORT}" SIPWISE_REPO_TRANSPORT="${SIPWISE_REPO_TRANSPORT}"
NAMESERVER="$(awk '/^nameserver/ {print $2}' /etc/resolv.conf)" NAMESERVER="$(awk '/^nameserver/ {print $2}' /etc/resolv.conf)"
NGCP_PPA="${NGCP_PPA}" NGCP_PPA="${NGCP_PPA}"

Loading…
Cancel
Save