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-05-21 08:26:23 -05:00
parent 9db0f53320
commit 8b6cfed43b
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mm-scripts.sh
View File

@@ -100,7 +100,7 @@ MMSTART(){
c=0; spc=''; spc1=$((${cw_spc}-${#msg})) c=0; spc=''; spc1=$((${cw_spc}-${#msg}))
until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
echo -en "${idsCL[LightCyan]}${msg}${spc} ${idsCL[White]}: ${idsCL[Default]}" echo -en "${idsCL[LightCyan]}${msg}${spc} ${idsCL[White]}: ${idsCL[Default]}"
VPNCONFIG VPNCONFIG_TORGUARD
echo -e "${idsCL[Green]}Done${idsCL[Default]}" echo -e "${idsCL[Green]}Done${idsCL[Default]}"
msg="Starting the VPN Tunnel" msg="Starting the VPN Tunnel"
@@ -740,7 +740,7 @@ GETVPNINFO(){
} }
VPNCONFIG(){ VPNCONFIG_TORGUARD(){
privkey=$(/usr/bin/wg genkey) privkey=$(/usr/bin/wg genkey)
reqpublickey=$(echo "${privkey}" | /usr/bin/wg pubkey) reqpublickey=$(echo "${privkey}" | /usr/bin/wg pubkey)
reqpublickey="$(php -r 'echo rawurlencode($argv[1]);' -- "$reqpublickey")" reqpublickey="$(php -r 'echo rawurlencode($argv[1]);' -- "$reqpublickey")"
@@ -748,12 +748,12 @@ VPNCONFIG(){
rm -f ${TMPFOLDER}/vpninfo rm -f ${TMPFOLDER}/vpninfo
JSON=$(curl https://${VPN_SERVER}:1443/api/v1/setup?public-key=${reqpublickey} --user "${VPN_USER}:${VPN_PASS}" -sk) JSON=$(curl https://${VPN_SERVER}:1443/api/v1/setup?public-key=${reqpublickey} --user "${VPN_USER}:${VPN_PASS}" -sk)
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')\"
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')\"
" > ${TMPFOLDER}/vpninfo " > ${TMPFOLDER}/vpninfo
source ${TMPFOLDER}/vpninfo source ${TMPFOLDER}/vpninfo
rm -f /etc/wireguard/${VPN_INTERFACE}.conf rm -f /etc/wireguard/${VPN_INTERFACE}.conf
@@ -797,7 +797,7 @@ VPNSPEEDTEST(){
echo echo
echo -en "${idsCL[LightCyan]}Starting vpn ... ${idsCL[Default]}" echo -en "${idsCL[LightCyan]}Starting vpn ... ${idsCL[Default]}"
# VPNCONFIG # VPNCONFIG_TORGUARD
# "${VPN_START[@]}" >/dev/null 2>&1 # "${VPN_START[@]}" >/dev/null 2>&1
mm start vpn >/dev/null 2>&1 mm start vpn >/dev/null 2>&1
echo -e "${idsCL[Green]}Done${idsCL[Default]}" echo -e "${idsCL[Green]}Done${idsCL[Default]}"