From e76192d13f2eb3d474e94f5a47fe42b281cf89c2 Mon Sep 17 00:00:00 2001 From: MarkusMcNugen Date: Fri, 14 Dec 2018 02:35:01 -0500 Subject: [PATCH] Update iptables.sh --- qbittorrent/iptables.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/qbittorrent/iptables.sh b/qbittorrent/iptables.sh index df4ec33..bc0f6c2 100644 --- a/qbittorrent/iptables.sh +++ b/qbittorrent/iptables.sh @@ -1,6 +1,8 @@ #!/bin/bash # Forked from binhex's OpenVPN dockers +DEBUG=false + # Wait until tunnel is up while : ; do tunnelstat=$(netstat -ie | grep -E "tun|tap") @@ -13,11 +15,6 @@ done echo "[info] WebUI port defined as ${WEBUI_PORT}" | ts '%Y-%m-%d %H:%M:%.S' -# ip route -### - -DEBUG=false - # strip whitespace from start and end of LAN_NETWORK export LAN_NETWORK=$(echo "${LAN_NETWORK}" | sed -e 's~^[ \t]*~~;s~[ \t]*$~~') echo "[info] LAN Network defined as ${LAN_NETWORK}" | ts '%Y-%m-%d %H:%M:%.S' @@ -27,7 +24,7 @@ DEFAULT_GATEWAY=$(ip -4 route list 0/0 | cut -d ' ' -f 3) echo "[info] Default gateway defined as ${DEFAULT_GATEWAY}" | ts '%Y-%m-%d %H:%M:%.S' #echo "[info] Adding ${LAN_NETWORK} as route via docker eth0" | ts '%Y-%m-%d %H:%M:%.S' -#ip route add "${LAN_NETWORK}" via "${DEFAULT_GATEWAY}" dev eth0 +ip route add "${LAN_NETWORK}" via "${DEFAULT_GATEWAY}" dev eth0 echo "[info] ip route defined as follows..." | ts '%Y-%m-%d %H:%M:%.S' echo "--------------------" @@ -50,7 +47,12 @@ if [[ $iptable_mangle_exit_code == 0 ]]; then echo "[info] iptable_mangle support detected, adding fwmark for tables" | ts '%Y-%m-%d %H:%M:%.S' # setup route for qbittorrent webui using set-mark to route traffic for port 8080 to eth0 - echo "8080 webui" >> /etc/iproute2/rt_tables + if [ -z "${WEBUI_PORT}" ]; then + echo "8080 webui" >> /etc/iproute2/rt_tables + else + echo "${WEBUI_PORT} webui" >> /etc/iproute2/rt_tables + fi + ip rule add fwmark 1 table webui ip route add default via ${DEFAULT_GATEWAY} table webui