voltron/mediamanager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update mm-scripts.sh

Browse Source
This commit is contained in:
David Schroeder
2023-03-24 23:06:05 -05:00
parent 52f73daaf4
commit c717a4c017
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mm-scripts.sh
View File

@@ -88,7 +88,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf
echo -e "$vpnaddress" >> ${MMFOLDER}/vpninfo.address echo -e "$vpnaddress" >> ${MMFOLDER}/vpninfo.address
echo -e "${idsCL[Green]} done${idsCL[Default]}" 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_server_ipv4=$(echo ${JSON} | jq -r '.server_ipv4')
vpn_client_ipv4=$(echo ${JSON} | jq -r '.client_ipv4') vpn_client_ipv4=$(echo ${JSON} | jq -r '.client_ipv4')
vpn_routes=$(echo ${JSON} | jq -r '.routes') vpn_routes=$(echo ${JSON} | jq -r '.routes')
@@ -485,23 +485,23 @@ MMSTATUS(){
} }
GETVPNINFO(){ GETVPNINFO(){
vpn_curpublickey=$(cat /opt/idssys/mediamanager/vpninfo.publickey) # 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) # 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_server_ipv4=`echo ${JSON} | jq -r '.server_ipv4'`
vpn_client_ipv4=`echo ${JSON} | jq -r '.client_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_address=`echo ${JSON} | jq -r '.vpn_server_address'`
vpn_server_port=`echo ${JSON} | jq -r '.vpn_server_port'` # 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]}" source /etc/wireguard/wg-torguard.conf
echo
echo -e "${idsCL[LightCyan]}Server Network : ${idsCL[Green]}${VPN_SERVER}${idsCL[Default]}"
echo $PrivateKey
echo ${JSON} | jq
# publickey=`echo ${JSON} | jq -r '.server_public_key'`
} }
if [ ! -f ${MMFOLDER}/mm.update.stop ]; then if [ ! -f ${MMFOLDER}/mm.update.stop ]; then