From c571cb8a97f9c6b1c831ff14283c419db5cc13d8 Mon Sep 17 00:00:00 2001 From: binhex Date: Tue, 13 Aug 2019 15:42:39 +0100 Subject: [PATCH] change tmp filename for iptables --- run/root/iptable.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/run/root/iptable.sh b/run/root/iptable.sh index f276505..7ea9a47 100644 --- a/run/root/iptable.sh +++ b/run/root/iptable.sh @@ -30,7 +30,7 @@ echo "[info] Docker network defined as ${docker_network_cidr}" # ip route ### -# split comma seperated string into list from LAN_NETWORK env variable +# split comma separated string into list from LAN_NETWORK env variable IFS=',' read -ra lan_network_list <<< "${LAN_NETWORK}" # process lan networks in the list @@ -39,7 +39,7 @@ for lan_network_item in "${lan_network_list[@]}"; do # strip whitespace from start and end of lan_network_item lan_network_item=$(echo "${lan_network_item}" | sed -e 's~^[ \t]*~~;s~[ \t]*$~~') - echo "[info] Adding ${lan_network_item} as route via docker lan interface" + echo "[info] Adding ${lan_network_item} as route via docker ${docker_interface}" ip route add "${lan_network_item}" via "${DEFAULT_GATEWAY}" dev "${docker_interface}" done @@ -49,7 +49,7 @@ echo "--------------------" ip route echo "--------------------" -# setup iptables marks to allow routing of defined ports via lan interface" +# setup iptables marks to allow routing of defined ports via lan ### if [[ "${DEBUG}" == "true" ]]; then @@ -80,9 +80,6 @@ iptables -P INPUT DROP # set policy to drop ipv6 for input ip6tables -P INPUT DROP 1>&- 2>&- -# accept input to tunnel adapter -iptables -A INPUT -i "${VPN_DEVICE_TYPE}" -j ACCEPT - # accept input to/from docker containers (172.x range is internal dhcp) iptables -A INPUT -s "${docker_network_cidr}" -d "${docker_network_cidr}" -j ACCEPT @@ -115,6 +112,9 @@ iptables -A INPUT -p icmp --icmp-type echo-reply -j ACCEPT # accept input to local loopback iptables -A INPUT -i lo -j ACCEPT +# accept input to tunnel adapter +iptables -A INPUT -i "${VPN_DEVICE_TYPE}" -j ACCEPT + # forward iptable rules ### @@ -179,8 +179,8 @@ iptables -A OUTPUT -o "${VPN_DEVICE_TYPE}" -j ACCEPT echo "[info] iptables defined as follows..." echo "--------------------" -iptables -S 2>&1 | tee /tmp/checkiptables -chmod +r /tmp/checkiptables +iptables -S 2>&1 | tee /tmp/getiptables +chmod +r /tmp/getiptables echo "--------------------" # change iptable 'tcp' to openvpn config compatible 'tcp-client' (this file is sourced)