diff --git a/mm-scripts.sh b/mm-scripts.sh index b006c14..a21a15d 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -92,7 +92,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf vpn_publickey= \"$(echo ${JSON} | jq -r '.server_public_key')\" vpn_server_ipv4= \"$(echo ${JSON} | jq -r '.server_ipv4')\" vpn_client_ipv4= \"$(echo ${JSON} | jq -r '.client_ipv4')\" -vpn_routes= \"$(echo ${JSON} | jq -r '.routes')\" +vpn_routes= \"$(echo ${JSON} | jq -r '.routes')\" vpn_server_address= \"$(echo ${JSON} | jq -r '.vpn_server_address')\" vpn_server_port= \"$(echo ${JSON} | jq -r '.vpn_server_port')\" " > ${MMFOLDER}/vpninfo @@ -159,7 +159,7 @@ vpn_server_port= \"$(echo ${JSON} | jq -r '.vpn_server_port')\" # if [ "${defaultgw}" != "${VPN_INTERFACE}" ]; then if [ "${zerogw}" != "${defaultgw}" ] || [ "${defaultgw}" != "${VPN_INTERFACE}" ]; then echo "$(date) - Adding VPN default routes" >> $logfile - echo -en "${idsCL[LightCyan]}Adding VPN default routes :${idsCL[Default]}" + echo -en "${idsCL[LightCyan]}Adding VPN default routes :${idsCL[Default]}" /bin/ip route del default /bin/ip route add default dev ${VPN_INTERFACE} /bin/ip route add 0.0.0.0/1 dev ${VPN_INTERFACE} @@ -417,8 +417,8 @@ MMSTATUS(){ if [[ ${srvc} == *"vpn"* ]] || [[ ${srvc} == *"wireguard"* ]]; then zerogw=$(/sbin/ip route show | grep 0.0.0.0 | cut -d' ' -f 3) defaultgw=$(/sbin/ip route show | grep default | cut -d' ' -f 3) - echo -e " |- 0.0.0.0 gateway : ${idsCL[Green]}$zerogw${idsCL[Default]}" - echo -en " |- DEFAULT gateway : " + echo -e " |- 0.0.0.0 gateway : ${idsCL[Green]}$zerogw${idsCL[Default]}" + echo -en " |- DEFAULT gateway : " if [ "${zerogw}" == "${defaultgw}" ] && [ "${zerogw}" == "${VPN_INTERFACE}" ]; then echo -e "${idsCL[Green]}$defaultgw${idsCL[Default]}" else