Update mm-scripts.sh

This commit is contained in:
2023-02-25 18:26:19 -06:00
parent 6b25a6642d
commit 1265f9acaa

View File

@@ -61,7 +61,7 @@ MMSTART(){
echo
OUT=$(ip link | grep "$VPN_INTERFACE")
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=$(wg genkey)
reqpublickey=$(echo "${privkey}" | wg pubkey)
reqpublickey="$(php -r 'echo rawurlencode($argv[1]);' -- "$reqpublickey")"
@@ -94,11 +94,11 @@ PersistentKeepalive = 25" >> /etc/wireguard/wg-torguard.conf
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
sleep 5s
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
else
mmsv='Verifying'
@@ -155,7 +155,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/wg-torguard.conf
# if [ "${zerogw}" != "${defaultgw}" ]; then
if [ "${defaultgw}" != "wg-torguard" ]; then
echo "$(date) - Adding VPN default routes" >> $logfile
echo -en "${idsCL[LightCyan]}Adding VPN default routes... ${idsCL[Default]}"
echo -en "${idsCL[LightCyan]}Adding VPN default routes :${idsCL[Default]}"
/bin/ip route del default
/bin/ip route add default dev wg-torguard
/bin/ip route add 0.0.0.0/1 dev wg-torguard
@@ -168,7 +168,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/wg-torguard.conf
fi
echo -en "${idsCL[LightCyan]}Verifing default network routes... ${idsCL[Default]}"
echo -en "${idsCL[LightCyan]}Verifing default network routes :${idsCL[Default]}"
checked=false
cc=0
until [ "${checked}" = "" ]; do
@@ -196,7 +196,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/wg-torguard.conf
echo -e "${idsCL[Green]} done${idsCL[Default]}"
echo -en "${idsCL[LightCyan]}Verifing traffic is routing through VPN... ${idsCL[Default]}"
echo -en "${idsCL[LightCyan]}Verifing traffic routing through VPN :${idsCL[Default]}"
scip=""
mmip=""
@@ -276,13 +276,13 @@ PersistentKeepalive = 25" >> /etc/wireguard/wg-torguard.conf
if [ "${2}" != "vpn" ]; then
echo -en "${idsCL[LightCyan]}${mmsv} Services... ${idsCL[Default]}"
echo -en "${idsCL[LightCyan]}${mmsv} Services :${idsCL[Default]}"
for srvc in "${SERVICES_CHECK[@]}"; do
/bin/systemctl start ${srvc}
done
echo -e "${idsCL[Green]} done${idsCL[Default]}"
else
echo -e "${idsCL[LightCyan]}Skipping ${mmsv} Services... ${idsCL[Default]}"
echo -e "${idsCL[LightCyan]}Skipping ${mmsv} Services ${idsCL[Default]}"
fi
echo