From 4ad35ad3989654ea44542c63cd37523fb29a789f Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 24 Mar 2023 22:56:53 -0500 Subject: [PATCH] Update mm-scripts.sh --- mm-scripts.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/mm-scripts.sh b/mm-scripts.sh index 44f8bd1..814a371 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -88,6 +88,13 @@ PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf echo -e "$vpnaddress" >> ${MMFOLDER}/vpninfo.address echo -e "${idsCL[Green]} done${idsCL[Default]}" +echo -e "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_server_address=$(echo ${JSON} | jq -r '.vpn_server_address') +vpn_server_port=$(echo ${JSON} | jq -r '.vpn_server_port') +" > ${MMFOLDER}/vpninfo echo -en "${idsCL[LightCyan]}Starting the VPN Tunnel :${idsCL[Default]}" @@ -480,6 +487,18 @@ MMSTATUS(){ GETVPNINFO(){ vpn_curpublickey=$(cat /opt/idssys/mediamanager/vpninfo.publickey) JSON=$(curl https://${VPN_SERVER}:1443/api/v1/setup?public-key=${vpn_curpublickey} --user "${VPN_USER}:${VPN_PASS}" -sk) + 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_server_address=`echo ${JSON} | jq -r '.vpn_server_address'` + vpn_server_port=`echo ${JSON} | jq -r '.vpn_server_port'` + + echo -e "${idsCL[Green]}VPN Connection Info${idsCL[Default]}" + echo + echo -e "${idsCL[LightCyan]}Server Network : ${idsCL[Green]}${VPN_SERVER}${idsCL[Default]}" + + + echo ${JSON} | jq # publickey=`echo ${JSON} | jq -r '.server_public_key'`