From 7507484d7c9be8b23a1ca95be156a92ddccee1ee Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 25 Feb 2020 15:31:15 +0100 Subject: [PATCH] Fix omr-service for latest release --- omr-service | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/omr-service b/omr-service index 44f0305..6098a98 100755 --- a/omr-service +++ b/omr-service @@ -97,11 +97,11 @@ $allip_mlvpn" if $(exit $statusp); then logger -t "OMR-Service" "Set new 6in4 tunnel IPs" ip tunnel change omr-6in4 mode sit remote $ipd local $ip - echo "VPS_ADDR=$ip" > /etc/shorewall/params.vpn - echo "OMR_ADDR=$ipd" >> /etc/shorewall/params.vpn - iface=$(ip -4 addr | grep $ip/ | awk '{print $7}' | tr -d "\n") - echo "VPS_IFACE=$iface" >> /etc/shorewall/params.vpn - systemctl reload shorewall + #echo "VPS_ADDR=$ip" > /etc/shorewall/params.vpn + #echo "OMR_ADDR=$ipd" >> /etc/shorewall/params.vpn + #iface=$(ip -4 addr | grep $ip/ | awk '{print $7}' | tr -d "\n") + #echo "VPS_IFACE=$iface" >> /etc/shorewall/params.vpn + #systemctl reload shorewall _multipath break fi @@ -109,7 +109,7 @@ $allip_mlvpn" fi done < <(printf '%s\n' "$allip") [ -z "$iface" ] && [ -f /etc/openmptcprouter-vps-admin/current-vpn ] && { - logger -t "OMR-Service" "Restart Glorytun and networkd" + logger -t "OMR-Service" "Restart Glorytun" current_vpn="$(cat /etc/openmptcprouter-vps-admin/current-vpn)" [ "$current_vpn" = "glorytun_tcp" ] && systemctl -q restart glorytun-tcp@tun0 [ "$current_vpn" = "glorytun_udp" ] && systemctl -q restart glorytun-udp@tun0