diff options
| author | Victor Mocanu | 2018-03-28 16:31:21 +0200 |
|---|---|---|
| committer | Victor Mocanu | 2018-03-28 16:31:21 +0200 |
| commit | 4567a633c5d234852a3161f1a0a481265f670e07 (patch) | |
| tree | 8d75f156758f5ba38331add27bb556248449a503 | |
| parent | [vbox-src] shared folders and vram ammount + 2Dacceleration set to true (diff) | |
| parent | [dnbd3-proxy-mode] Workaround for broken slx-admin whitelist, apply to all ifs (diff) | |
| download | mltk-4567a633c5d234852a3161f1a0a481265f670e07.tar.gz mltk-4567a633c5d234852a3161f1a0a481265f670e07.tar.xz mltk-4567a633c5d234852a3161f1a0a481265f670e07.zip | |
Merge branch 'master' of http://git.openslx.org/openslx-ng/mltk
| -rwxr-xr-x | core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy b/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy index e19788bc..ff889fde 100755 --- a/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy +++ b/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy @@ -156,13 +156,15 @@ done rm -f "/opt/openslx/iptables/rules.d/99-dnbd3" # now create iptables helper rules -if [ -n "${SLX_DNBD3_WHITELIST}" ]; then +if [ -n "${SLX_DNBD3_WHITELIST}" ] && [ "${SLX_DNBD3_WHITELIST%/*}" != "${SLX_DNBD3_WHITELIST}" ]; then + # XXX: Remove the second check above after ~ 2018-10-01 -- it's a workaround for broken slx-admin + # that won't properly calculate CIDR notion resulting in a severely locked down proxy :( DNBD3_IPTABLES_CONF="$(mktemp)" echo '#!/bin/ash' > "${DNBD3_IPTABLES_CONF}" - for CIDR in ${SLX_DNBD3_WHITELIST}; do - echo "iptables -I ipt-helper-INPUT 1 -i br0 -p tcp -s ${CIDR} --dport ${DNBD3_PORT} -j ACCEPT" + for CIDR in ${SLX_DNBD3_WHITELIST} ${SLX_KCL_SERVERS}; do + echo "iptables -I ipt-helper-INPUT 1 -p tcp -s ${CIDR} --dport ${DNBD3_PORT} -j ACCEPT" done >> "${DNBD3_IPTABLES_CONF}" - echo "iptables -A ipt-helper-INPUT -i br0 -p tcp --dport ${DNBD3_PORT} -j REJECT" >> "${DNBD3_IPTABLES_CONF}" + echo "iptables -A ipt-helper-INPUT -p tcp --dport ${DNBD3_PORT} -j REJECT" >> "${DNBD3_IPTABLES_CONF}" chmod +x "${DNBD3_IPTABLES_CONF}" mv -f "$DNBD3_IPTABLES_CONF" "/opt/openslx/iptables/rules.d/99-dnbd3" fi |