diff options
| author | Jonathan Bauer | 2015-10-29 13:25:59 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2015-10-29 13:25:59 +0100 |
| commit | f44812d259866c66409f3c373ba2626efae5ec95 (patch) | |
| tree | 00992e6c64d7e9c9fe060a0c6dd7267e1776e76a /remote/modules | |
| parent | [cups-freiburg] removed RZMONO2 since it's long dead (diff) | |
| parent | [rootfs-*] Disable 'demo' login, support $SLX_DEMO_PASS to set a password via... (diff) | |
| download | tm-scripts-f44812d259866c66409f3c373ba2626efae5ec95.tar.gz tm-scripts-f44812d259866c66409f3c373ba2626efae5ec95.tar.xz tm-scripts-f44812d259866c66409f3c373ba2626efae5ec95.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/cups/module.conf | 1 | ||||
| -rw-r--r-- | remote/modules/kernel-vanilla/module.conf | 2 | ||||
| -rwxr-xr-x | remote/modules/redsocks/data/opt/openslx/scripts/systemd-setup_proxy | 17 |
3 files changed, 11 insertions, 9 deletions
diff --git a/remote/modules/cups/module.conf b/remote/modules/cups/module.conf index 513389b5..6ec99ac9 100644 --- a/remote/modules/cups/module.conf +++ b/remote/modules/cups/module.conf @@ -7,6 +7,7 @@ REQUIRED_DIRECTORIES=" /usr/lib/cups/ /usr/share/cups/ /usr/share/ghostscript/ + /usr/share/ppd/cupsfilters/ /usr/bin/ " REQUIRED_FILES="" diff --git a/remote/modules/kernel-vanilla/module.conf b/remote/modules/kernel-vanilla/module.conf index 68a0034b..9e9d8fab 100644 --- a/remote/modules/kernel-vanilla/module.conf +++ b/remote/modules/kernel-vanilla/module.conf @@ -1,5 +1,5 @@ REQUIRED_BINARIES="" REQUIRED_LIBRARIES="" REQUIRED_DIRECTORIES="" -REQUIRED_KERNEL="4.2.3" +REQUIRED_KERNEL="4.2.4" REQUIRED_GIT="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git" diff --git a/remote/modules/redsocks/data/opt/openslx/scripts/systemd-setup_proxy b/remote/modules/redsocks/data/opt/openslx/scripts/systemd-setup_proxy index 86b19e97..97ef8225 100755 --- a/remote/modules/redsocks/data/opt/openslx/scripts/systemd-setup_proxy +++ b/remote/modules/redsocks/data/opt/openslx/scripts/systemd-setup_proxy @@ -16,17 +16,18 @@ PROXY=off if [ "$SLX_PROXY_MODE" == "on" ]; then PROXY=on elif [ "$SLX_PROXY_MODE" == "auto" -a -n "$SLX_PXE_CLIENT_IP" ]; then - [[ "$SLX_PXE_CLIENT_IP" =~ ^10\. ]] && PROXY=on - [[ "$SLX_PXE_CLIENT_IP" =~ ^192\.168\. ]] && PROXY=on - [[ "$SLX_PXE_CLIENT_IP" =~ ^172\.[123][0-9]\. ]] && PROXY=on + # auto detection: check if it is actually needed + RET=$(curl -m 2 -s http://www.google.de/ | grep -o google | wc -l) + if [ $RET -lt 20 ]; then + sleep 4 + RET=$(curl -m 5 -s http://www.google.de/ | grep -o google | wc -l) + fi + [ $RET -gt 20 ] && echo "Auto detect: Internet is reachable without proxy." && exit 0 + PROXY=on fi [ "$PROXY" == "off" ] && echo "Proxy mode not required." && exit 0 - -# wants a proxy from the config file and the client's ip, check if it is actually needed -/opt/openslx/bin/ping -w 5 -c 3 www.google.de -RET=$? -[ $RET -eq 0 ] && echo "Internet is reachable without proxy." && exit 0 +echo "Setting up transparent proxying via $SLX_PROXY_IP" sed -i "s/%%PROXY_IP%%/$SLX_PROXY_IP/g;s/%%PROXY_PORT%%/$SLX_PROXY_PORT/g;s/%%PROXY_TYPE%%/$SLX_PROXY_TYPE/g" /etc/redsocks.conf |