summaryrefslogtreecommitdiff
path: root/install-itzks-workstation
diff options
context:
space:
mode:
authorBenjamin Schlüter <bschlueter@posteo.de>2018-01-30 12:57:07 +0100
committerBenjamin Schlüter <bschlueter@posteo.de>2018-01-30 12:57:07 +0100
commita543ee2f0b03b085e2a838a14e70bebf2d2a6c65 (patch)
tree63fd5096a27107506b69da317cf7ff619f221313 /install-itzks-workstation
parentef7b3b07b301a24a11250c2e68fb0b3336a1c8fd (diff)
downloaditzks-install-script-a543ee2f0b03b085e2a838a14e70bebf2d2a6c65.tar.gz
itzks-install-script-a543ee2f0b03b085e2a838a14e70bebf2d2a6c65.tar.bz2
itzks-install-script-a543ee2f0b03b085e2a838a14e70bebf2d2a6c65.zip
Add fix for /usr/share/debian-edu-config/tools/wpad-extract.
Diffstat (limited to 'install-itzks-workstation')
-rw-r--r--install-itzks-workstation21
1 files changed, 21 insertions, 0 deletions
diff --git a/install-itzks-workstation b/install-itzks-workstation
index 69dac79..115c71e 100644
--- a/install-itzks-workstation
+++ b/install-itzks-workstation
@@ -163,6 +163,27 @@ mv /etc/NetworkManager/system-connections/SSID.in /etc/NetworkManager/system-con
# Set permissions on generated file
chmod go-rwx /etc/NetworkManager/system-connections/"$ssid"
+# Write new content for /usr/share/debian-edu-config/tools/wpad-extract
+
+cat <<EOT >> /usr/share/debian-edu-config/tools/wpad-extract
+#!/bin/bash
+#
+# Detect proxy URL via WPAD
+#
+# Author: Wolfgang Schweer
+# License: GNU General Public License v2 or later
+
+# This version uses pactester from package libpacparser1.
+
+# Look up one of the www.debian.org IP addresses to avoid hanging on
+# DNS if the skolelinux machines are not connected to the Internet.
+proxy_url=$(curl -s http://wpad/wpad.dat | pactester -p - \
+ -u http://130.89.148.14 | awk '{print $2}' | cut -d';' -f1)
+echo http_proxy=http://$proxy_url
+EOT
+
+# Run /usr/share/debian-edu-config/tools/update-proxy-from-wpad
+./usr/share/debian-edu-config/tools/update-proxy-from-wpad
####################