summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Schlüter <bschlueter@posteo.de>2018-02-28 11:53:59 +0100
committerBenjamin Schlüter <bschlueter@posteo.de>2018-02-28 11:53:59 +0100
commitf2bbd4847333b05b340716fcf1c22dc99819c123 (patch)
tree38044b4a726be417177344d55044c393ecc9a2aa
parenteab4ed50bcb14510072c821911f23a5e670982d9 (diff)
downloaditzks-systems-f2bbd4847333b05b340716fcf1c22dc99819c123.tar.gz
itzks-systems-f2bbd4847333b05b340716fcf1c22dc99819c123.tar.bz2
itzks-systems-f2bbd4847333b05b340716fcf1c22dc99819c123.zip
Add new /usr/share/debian-edu-config/wpad-extract script and install with itzks-systems-common.
-rw-r--r--debian/itzks-systems-common.install1
-rwxr-xr-xshare/debian-edu-config/tools/wpad-extract14
2 files changed, 15 insertions, 0 deletions
diff --git a/debian/itzks-systems-common.install b/debian/itzks-systems-common.install
index b99c9e2..e5c16ae 100644
--- a/debian/itzks-systems-common.install
+++ b/debian/itzks-systems-common.install
@@ -9,6 +9,7 @@ etc/sitesummary/* etc/sitesummary/
etc/standardskriver.cfg etc/
etc/sudoers.d/itzks-systems-common etc/sudoers.d/
sbin/itzks-systems.do_preseed
+share/debian-edu-config/ /usr/share/
share/itzks-systems-common/ usr/share/
usr-lib-nagios-plugins/check_fs_ro.sh usr/lib/nagios/plugins/
usr-lib-nagios-plugins/check_mem.pl usr/lib/nagios/plugins/
diff --git a/share/debian-edu-config/tools/wpad-extract b/share/debian-edu-config/tools/wpad-extract
new file mode 100755
index 0000000..57eca70
--- /dev/null
+++ b/share/debian-edu-config/tools/wpad-extract
@@ -0,0 +1,14 @@
+#!/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