From a543ee2f0b03b085e2a838a14e70bebf2d2a6c65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Schl=C3=BCter?= Date: Tue, 30 Jan 2018 12:57:07 +0100 Subject: Add fix for /usr/share/debian-edu-config/tools/wpad-extract. --- install-itzks-workstation | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) 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 <> /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 #################### -- cgit v1.2.3