summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-05-31 10:23:13 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-05-31 10:23:13 +0200
commit318547f064edc7259e57fa1f51a2850484c3af98 (patch)
tree02fd75a5ceb491b64a2c3fbbdf4ecb9a029a413f
parente7d2cd49a731408cd9485210770de919b6e3d48d (diff)
downloaditzks-install-script-318547f064edc7259e57fa1f51a2850484c3af98.tar.gz
itzks-install-script-318547f064edc7259e57fa1f51a2850484c3af98.tar.bz2
itzks-install-script-318547f064edc7259e57fa1f51a2850484c3af98.zip
Make sure proxy settings are in place before first APT command being issued. Also wipe APT package cache earlier (before first apt-get update).
-rwxr-xr-xinstall-itzks-workstation16
1 files changed, 8 insertions, 8 deletions
diff --git a/install-itzks-workstation b/install-itzks-workstation
index fb29e94..093c172 100755
--- a/install-itzks-workstation
+++ b/install-itzks-workstation
@@ -49,6 +49,14 @@ fi
# Retrieve LDAP CA certificate
invoke-rc.d fetch-ldap-cert start
+# Export proxy-settings for first install
+export https_proxy=http://webcache:3128
+export http_proxy=http://webcache:3128
+export ftp_proxy=http://webcache:3128
+
+# take out the hammer and drop all previous package lists.
+find /var/lib/apt/lists/ -type f -delete
+
# Run upgrades to ensure the base system is as up-to-date as possible
apt-get update 1>/dev/null
apt-get upgrade -y
@@ -60,11 +68,6 @@ if [ ! -e "/etc/apt/sources.list.d/itzks.list" ]; then
echo "deb http://packages.it-zukunft-schule.de/debian stretch-backports main contrib non-free" >> /etc/apt/sources.list.d/itzks.list
fi
-# Export proxy-settings for first install
-export https_proxy=http://webcache:3128
-export http_proxy=http://webcache:3128
-export ftp_proxy=http://webcache:3128
-
# FIXME: We don't want to use Debian's old redirector service, but the new one...
# The below line is the ideal solution, but it does not work, sometimes the
# redirector URLs fail to produce a Release file. For whatever reason.
@@ -72,9 +75,6 @@ export ftp_proxy=http://webcache:3128
sed -r -i /etc/apt/sources.list -e "s@http.debian.net@ftp.de.debian.org@g"
sed -r -i /etc/apt/sources.list -e "s@httpredir.debian.org@ftp.de.debian.org@g"
-# take out the hammer and drop all previous package lists.
-find /var/lib/apt/lists/ -type f -delete
-
# Get update and add itzks-keyring and itzks-systems-common package
apt-get update 1>/dev/null
apt_install_if_not --allow-unauthenticated itzks-keyring