diff options
author | Benjamin Schlüter <bschlueter@posteo.de> | 2018-02-28 16:10:28 +0100 |
---|---|---|
committer | Benjamin Schlüter <bschlueter@posteo.de> | 2018-02-28 16:10:28 +0100 |
commit | a787b1a0c502334f2fb42958a532c4f4b1b2f7bf (patch) | |
tree | 3274e39caf86bee462696210c2c4f22dd83069f9 | |
parent | 5c07697dc35d6abcc2224a44593bc74e1e9cac1d (diff) | |
download | itzks-systems-a787b1a0c502334f2fb42958a532c4f4b1b2f7bf.tar.gz itzks-systems-a787b1a0c502334f2fb42958a532c4f4b1b2f7bf.tar.bz2 itzks-systems-a787b1a0c502334f2fb42958a532c4f4b1b2f7bf.zip |
Revert seperate installation of new wpad-extract script as that is covered by upstream debian-edu-config.
-rw-r--r-- | debian/itzks-systems-common.install | 1 | ||||
-rwxr-xr-x | share/debian-edu-config/tools/wpad-extract | 14 |
2 files changed, 0 insertions, 15 deletions
diff --git a/debian/itzks-systems-common.install b/debian/itzks-systems-common.install index e5c16ae..b99c9e2 100644 --- a/debian/itzks-systems-common.install +++ b/debian/itzks-systems-common.install @@ -9,7 +9,6 @@ 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 deleted file mode 100755 index 57eca70..0000000 --- a/share/debian-edu-config/tools/wpad-extract +++ /dev/null @@ -1,14 +0,0 @@ -#!/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 |