diff --git a/deployment.sh b/deployment.sh index ce5d52e..9712596 100755 --- a/deployment.sh +++ b/deployment.sh @@ -59,6 +59,8 @@ ADJUST_FOR_LOW_PERFORMANCE=false ENABLE_VM_SERVICES=false FILESYSTEM="ext4" SYSTEMD=false +DEBIAN_REPO_HOST="debian.sipwise.com" +SIPWISE_REPO_HOST="deb.sipwise.com" # if TARGET_DISK environment variable is set accept it if [ -n "$TARGET_DISK" ] ; then @@ -136,7 +138,7 @@ loadNfsIpArray() { } install_sipwise_key() { - wget -O /etc/apt/trusted.gpg.d/sipwise.gpg http://deb.sipwise.com/spce/sipwise.gpg + wget -O /etc/apt/trusted.gpg.d/sipwise.gpg http://${SIPWISE_REPO_HOST}/spce/sipwise.gpg md5sum_sipwise_key_expected=32a4907a7d7aabe325395ca07c531234 md5sum_sipwise_key_calculated=$(md5sum /etc/apt/trusted.gpg.d/sipwise.gpg | awk '{print $1}') @@ -177,7 +179,7 @@ fai_upgrade() { local TMPDIR=$(mktemp -d) mkdir -p "${TMPDIR}/statedir/lists/partial" "${TMPDIR}/cachedir/archives/partial" local debsrcfile=$(mktemp) - echo "deb http://debian.sipwise.com/wheezy-backports wheezy-backports main" >> "$debsrcfile" + echo "deb http://${DEBIAN_REPO_HOST}/wheezy-backports wheezy-backports main" >> "$debsrcfile" DEBIAN_FRONTEND='noninteractive' apt-get -o dir::cache="${TMPDIR}/cachedir" \ -o dir::state="${TMPDIR}/statedir" -o dir::etc::sourcelist="$debsrcfile" \ @@ -199,10 +201,10 @@ grml_debootstrap_upgrade() { local TMPDIR=$(mktemp -d) mkdir -p "${TMPDIR}/statedir/lists/partial" "${TMPDIR}/cachedir/archives/partial" local debsrcfile=$(mktemp) - echo "deb http://deb.sipwise.com/grml.org grml-testing main" >> "$debsrcfile" + echo "deb http://${SIPWISE_REPO_HOST}/grml.org grml-testing main" >> "$debsrcfile" # the Sipwise deb.grml.org mirror is signed with 0xA42C4F2A (= 680FBA8A) - wget -O /etc/apt/680FBA8A.asc http://deb.sipwise.com/autobuild/680FBA8A.asc + wget -O /etc/apt/680FBA8A.asc http://${SIPWISE_REPO_HOST}/autobuild/680FBA8A.asc apt-key add /etc/apt/680FBA8A.asc DEBIAN_FRONTEND='noninteractive' apt-get -o dir::cache="${TMPDIR}/cachedir" \ @@ -223,7 +225,7 @@ install_vbox_package() { local TMPDIR=$(mktemp -d) mkdir -p "${TMPDIR}/etc/preferences.d" "${TMPDIR}/statedir/lists/partial" \ "${TMPDIR}/cachedir/archives/partial" - echo "deb http://debian.sipwise.com/debian/ wheezy-backports non-free" > \ + echo "deb http://${DEBIAN_REPO_HOST}/debian/ wheezy-backports non-free" > \ "${TMPDIR}/etc/sources.list" DEBIAN_FRONTEND='noninteractive' apt-get -o dir::cache="${TMPDIR}/cachedir" \ @@ -509,6 +511,14 @@ if checkBootParam ngcpnonwrecfg ; then logit "Disabling reconfig network as requested via boot option ngcpnonwrecfg" RESTART_NETWORK=false fi + +if checkBootParam debianrepo ; then + DEBIAN_REPO_HOST=$(getBootParam debianrepo) +fi + +if checkBootParam sipwiserepo ; then + SIPWISE_REPO_HOST=$(getBootParam sipwiserepo) +fi ## }}} ## interactive mode {{{ @@ -536,6 +546,8 @@ Control installation parameters: noinstall - do not install neither Debian nor NGCP ngcpinst - force usage of NGCP installer ngcpinstvers=... - use specific NGCP installer version + debianrepo=... - hostname of Debian APT repository mirror + sipwiserepo=... - hostname of Sipwise APT repository mirror Control target system: @@ -1112,7 +1124,7 @@ echo "systemd.sh: mounting rootfs $ROOT_FS to $TARGET" mount "$ROOT_FS" "$TARGET" echo "systemd.sh: enabling ${DEBIAN_RELEASE} backports" -echo deb http://debian.sipwise.com/debian/ ${DEBIAN_RELEASE}-backports main contrib non-free >> ${TARGET}/etc/apt/sources.list.d/systemd.list +echo deb http://${DEBIAN_REPO_HOST}/debian/ ${DEBIAN_RELEASE}-backports main contrib non-free >> ${TARGET}/etc/apt/sources.list.d/systemd.list chroot $TARGET apt-get update echo "systemd.sh: installing systemd" @@ -1138,8 +1150,8 @@ else # NOTE: we use the debian.sipwise.com CNAME by intention here # to avoid conflicts with apt-pinning, preferring deb.sipwise.com # over official Debian - MIRROR='http://debian.sipwise.com/debian/' - SEC_MIRROR='http://debian.sipwise.com/debian-security/' + MIRROR="http://${DEBIAN_REPO_HOST}/debian/" + SEC_MIRROR="http://${DEBIAN_REPO_HOST}/debian-security/" KEYRING='/etc/apt/trusted.gpg.d/sipwise.gpg' fi @@ -1328,9 +1340,9 @@ get_installer_path() { INSTALLER=ngcp-installer-latest.deb if $PRO_EDITION ; then - INSTALLER_PATH="http://deb.sipwise.com/sppro/" + INSTALLER_PATH="http://${SIPWISE_REPO_HOST}/sppro/" else - INSTALLER_PATH="http://deb.sipwise.com/spce/" + INSTALLER_PATH="http://${SIPWISE_REPO_HOST}/spce/" fi return # we don't want to run any further code from this function @@ -1343,18 +1355,18 @@ get_installer_path() { else local installer_package='ngcp-installer-pro' fi - local repos_base_path="http://deb.sipwise.com/sppro/${SP_VERSION}/dists/${DEBIAN_RELEASE}/main/binary-amd64/" - INSTALLER_PATH="http://deb.sipwise.com/sppro/${SP_VERSION}/pool/main/n/ngcp-installer/" + local repos_base_path="http://${SIPWISE_REPO_HOST}/sppro/${SP_VERSION}/dists/${DEBIAN_RELEASE}/main/binary-amd64/" + INSTALLER_PATH="http://${SIPWISE_REPO_HOST}/sppro/${SP_VERSION}/pool/main/n/ngcp-installer/" else local installer_package='ngcp-installer-ce' - local repos_base_path="http://deb.sipwise.com/spce/${SP_VERSION}/dists/${DEBIAN_RELEASE}/main/binary-amd64/" - INSTALLER_PATH="http://deb.sipwise.com/spce/${SP_VERSION}/pool/main/n/ngcp-installer/" + local repos_base_path="http://${SIPWISE_REPO_HOST}/spce/${SP_VERSION}/dists/${DEBIAN_RELEASE}/main/binary-amd64/" + INSTALLER_PATH="http://${SIPWISE_REPO_HOST}/spce/${SP_VERSION}/pool/main/n/ngcp-installer/" fi # use a separate repos for trunk releases if $TRUNK_VERSION ; then - local repos_base_path="http://deb.sipwise.com/autobuild/dists/release-trunk-${DEBIAN_RELEASE}/main/binary-amd64/" - INSTALLER_PATH="http://deb.sipwise.com/autobuild/pool/main/n/ngcp-installer/" + local repos_base_path="http://${SIPWISE_REPO_HOST}/autobuild/dists/release-trunk-${DEBIAN_RELEASE}/main/binary-amd64/" + INSTALLER_PATH="http://${SIPWISE_REPO_HOST}/autobuild/pool/main/n/ngcp-installer/" fi wget --timeout=30 -O Packages "${repos_base_path}/Packages" @@ -1442,10 +1454,10 @@ EOF ## custom sources.list, deployed via deployment.sh # Sipwise repositories -deb [arch=amd64] http://deb.sipwise.com/autobuild/release/release-${AUTOBUILD_RELEASE} release-${AUTOBUILD_RELEASE} main +deb [arch=amd64] http://${SIPWISE_REPO_HOST}/autobuild/release/release-${AUTOBUILD_RELEASE} release-${AUTOBUILD_RELEASE} main # Sipwise ${DEBIAN_RELEASE} backports -deb [arch=amd64] http://deb.sipwise.com/${DEBIAN_RELEASE}-backports/ ${DEBIAN_RELEASE}-backports main +deb [arch=amd64] http://${SIPWISE_REPO_HOST}/${DEBIAN_RELEASE}-backports/ ${DEBIAN_RELEASE}-backports main EOF elif [ -n "$MRBUILD_RELEASE" ] ; then @@ -1454,23 +1466,23 @@ EOF if "$PRO_EDITION" ; then cat >> $TARGET/etc/apt/sources.list.d/sipwise.list << EOF # Sipwise repository -deb [arch=amd64] http://deb.sipwise.com/sppro/${MRBUILD_RELEASE}/ ${DEBIAN_RELEASE} main -#deb-src http://deb.sipwise.com/sppro/${MRBUILD_RELEASE}/ ${DEBIAN_RELEASE} main +deb [arch=amd64] http://${SIPWISE_REPO_HOST}/sppro/${MRBUILD_RELEASE}/ ${DEBIAN_RELEASE} main +#deb-src http://${SIPWISE_REPO_HOST}/sppro/${MRBUILD_RELEASE}/ ${DEBIAN_RELEASE} main EOF else # CE cat >> $TARGET/etc/apt/sources.list.d/sipwise.list << EOF # Sipwise repository -deb [arch=amd64] http://deb.sipwise.com/spce/${MRBUILD_RELEASE}/ ${DEBIAN_RELEASE} main -#deb-src http://deb.sipwise.com/spce/${MRBUILD_RELEASE}/ ${DEBIAN_RELEASE} main +deb [arch=amd64] http://${SIPWISE_REPO_HOST}/spce/${MRBUILD_RELEASE}/ ${DEBIAN_RELEASE} main +#deb-src http://${SIPWISE_REPO_HOST}/spce/${MRBUILD_RELEASE}/ ${DEBIAN_RELEASE} main EOF fi cat >> $TARGET/etc/apt/sources.list.d/sipwise.list << EOF # Sipwise $DEBIAN_RELEASE backports -deb [arch=amd64] http://deb.sipwise.com/${DEBIAN_RELEASE}-backports/ ${DEBIAN_RELEASE}-backports main -#deb-src http://deb.sipwise.com/${DEBIAN_RELEASE}-backports/ ${DEBIAN_RELEASE}-backports main +deb [arch=amd64] http://${SIPWISE_REPO_HOST}/${DEBIAN_RELEASE}-backports/ ${DEBIAN_RELEASE}-backports main +#deb-src http://${SIPWISE_REPO_HOST}/${DEBIAN_RELEASE}-backports/ ${DEBIAN_RELEASE}-backports main EOF fi # $MRBUILD_RELEASE @@ -2097,7 +2109,7 @@ vagrant_configuration() { echo "Sipwise Debian mirror key is already present." else echo "Installing Sipwise Debian mirror key (680FBA8A)." - grml-chroot "${TARGET}" wget -O /etc/apt/680FBA8A.asc http://deb.sipwise.com/autobuild/680FBA8A.asc + grml-chroot "${TARGET}" wget -O /etc/apt/680FBA8A.asc http://${SIPWISE_REPO_HOST}/autobuild/680FBA8A.asc grml-chroot "${TARGET}" apt-key add /etc/apt/680FBA8A.asc fi