diff --git a/mm-scripts.sh b/mm-scripts.sh index e9263ea..51d1421 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -88,7 +88,7 @@ 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') + 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') @@ -485,23 +485,23 @@ 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'` + # 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 - echo -e "${idsCL[Green]}VPN Connection Info${idsCL[Default]}" - echo - echo -e "${idsCL[LightCyan]}Server Network : ${idsCL[Green]}${VPN_SERVER}${idsCL[Default]}" + source /etc/wireguard/wg-torguard.conf - - - echo ${JSON} | jq - - # publickey=`echo ${JSON} | jq -r '.server_public_key'` + echo $PrivateKey } if [ ! -f ${MMFOLDER}/mm.update.stop ]; then