summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-03-07 14:51:57 +0000
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-03-07 14:51:57 +0000
commit7b966bdf2c00056b2109bc52d52030f52be6c622 (patch)
treec66885ddfb48df1f35b5256e898e35acc73a67c3
parent9e6b9ceb29a6243efb8c78c9b2028f55b93d5291 (diff)
downloaditzks-install-script-7b966bdf2c00056b2109bc52d52030f52be6c622.tar.gz
itzks-install-script-7b966bdf2c00056b2109bc52d52030f52be6c622.tar.bz2
itzks-install-script-7b966bdf2c00056b2109bc52d52030f52be6c622.zip
Remove wpad-extract rewrite creation, now in debian-edu-config (>= 1.929+deb9u1).
-rwxr-xr-xinstall-itzks-workstation23
1 files changed, 0 insertions, 23 deletions
diff --git a/install-itzks-workstation b/install-itzks-workstation
index f931b84..d45ded5 100755
--- a/install-itzks-workstation
+++ b/install-itzks-workstation
@@ -217,29 +217,6 @@ EOT
unset ssid
fi
-# Write new content for /usr/share/debian-edu-config/tools/wpad-extract.
-# Workaround for Debian bug #888829. Probably fixed with debian-edu-config 1.929+deb9u1.
-
-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
-
####################
# Configure Plymouth