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:02:00 -05:00
parent 4ad35ad398
commit 52f73daaf4
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mm-scripts.sh
View File

@@ -57,7 +57,7 @@ MMSTART(){
echo echo
OUT=$(/sbin/ip link | grep "${VPN_INTERFACE}") OUT=$(/sbin/ip link | grep "${VPN_INTERFACE}")
if [ ${#OUT} = 0 ]; then if [ ${#OUT} = 0 ]; then
echo -en "${idsCL[LightCyan]}Setting up the VPN Tunnel config :${idsCL[Default]}" echo -en "${idsCL[LightCyan]}Setting up the VPN Tunnel config :${idsCL[Default]}"
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")"
@@ -97,14 +97,14 @@ vpn_server_port=$(echo ${JSON} | jq -r '.vpn_server_port')
" > ${MMFOLDER}/vpninfo " > ${MMFOLDER}/vpninfo
echo -en "${idsCL[LightCyan]}Starting the VPN Tunnel :${idsCL[Default]}" echo -en "${idsCL[LightCyan]}Starting the VPN Tunnel :${idsCL[Default]}"
"${VPN_START[@]}" >/dev/null 2>&1 "${VPN_START[@]}" >/dev/null 2>&1
sleep 5s sleep 5s
else else
echo -en "${idsCL[Green]}The VPN Tunnel is already running :${idsCL[Default]}" echo -en "${idsCL[Green]}The VPN Tunnel is already running :${idsCL[Default]}"
fi fi
else else
echo -en "${idsCL[LightCyan]}Verifying the VPN Tunnel :${idsCL[Default]}" echo -en "${idsCL[LightCyan]}Verifying the VPN Tunnel :${idsCL[Default]}"
mmsv='Verifying' mmsv='Verifying'
fi fi
@@ -400,7 +400,7 @@ MMSTATUS(){
statusArray+=(${SERVICES_CHECK[@]}) statusArray+=(${SERVICES_CHECK[@]})
echo echo
for srvc in "${statusArray[@]}"; do for srvc in "${statusArray[@]}"; do
c=0; cw=37 spc='' c=0; cw=38 spc=''
spc1=$((${cw}-${#NM_SERVICES[${srvc}]})) spc1=$((${cw}-${#NM_SERVICES[${srvc}]}))
until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
echo -en " ${NM_SERVICES[${srvc}]}$spc: " echo -en " ${NM_SERVICES[${srvc}]}$spc: "
@@ -434,11 +434,11 @@ MMSTATUS(){
echo echo
MMSTART MMSTART
echo -e " ${NM_SERVICES[wireguard]} : ${idsCL[Green]}Running${idsCL[Default]}" echo -e " ${NM_SERVICES[wireguard]} : ${idsCL[Green]}Running${idsCL[Default]}"
zerogw=$(/sbin/ip route show | grep 0.0.0.0 | cut -d' ' -f 3) 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) defaultgw=$(/sbin/ip route show | grep default | cut -d' ' -f 3)
echo -e " |- 0.0.0.0 gateway : ${idsCL[Green]}$zerogw${idsCL[Default]}" echo -e " |- 0.0.0.0 gateway : ${idsCL[Green]}$zerogw${idsCL[Default]}"
echo -en " |- DEFAULT gateway : " echo -en " |- DEFAULT gateway : "
if [ "${zerogw}" == "${defaultgw}" ] && [ "${zerogw}" == "${VPN_INTERFACE}" ]; then if [ "${zerogw}" == "${defaultgw}" ] && [ "${zerogw}" == "${VPN_INTERFACE}" ]; then
echo -e "${idsCL[Green]}$defaultgw${idsCL[Default]}" echo -e "${idsCL[Green]}$defaultgw${idsCL[Default]}"
else else
@@ -453,7 +453,7 @@ MMSTATUS(){
fi fi
fi fi
echo -en " |- Verify routing through VPN : " echo -en " |- Verify routing through VPN : "
scip=$(/usr/bin/dig +short sc1.scity.us @10.10.10.5 -p 5053) scip=$(/usr/bin/dig +short sc1.scity.us @10.10.10.5 -p 5053)
# mmip=$(/usr/bin/dig +short myip.opendns.com @resolver1.opendns.com) # mmip=$(/usr/bin/dig +short myip.opendns.com @resolver1.opendns.com)
mmip=$(/usr/bin/dig +short +time=2 myip.opendns.com @208.67.222.222) mmip=$(/usr/bin/dig +short +time=2 myip.opendns.com @208.67.222.222)