diff --git a/defaults.inc b/defaults.inc index 1f142ad..81dfffa 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='3.9.63-11082023' +VERS='3.9.64-11082023' MMFOLDER="/opt/idssys/mediamanager" TMPFOLDER="${MMFOLDER}/.tmp" @@ -117,9 +117,9 @@ else #default wireguard fi DEBUGLOGSTOP(){ - chktmend=`date +%s` - chktm=$((chktmend-chktmstart)) - echo "$(date) - ${mmsv} Runtime: ${chktm}s" >> ${MM_LOGFILE} + # chktmend=`date +%s` + # chktm=$((chktmend-chktmstart)) + # echo "$(date) - ${mmsv} Runtime: ${chktm}s" >> ${MM_LOGFILE} } MMUPDATECHECK(){ diff --git a/mm-scripts.sh b/mm-scripts.sh index da1b9fb..2117639 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -95,9 +95,8 @@ MMSTART(){ mmsv='Starting' echo OUT=$(/bin/ip link | grep "${VPN_INTERFACE}") - echo "$(date) - ${mmsv} VPN..." >> ${MM_LOGFILE} if [ ${#OUT} = 0 ]; then - + echo "$(date) - ${mmsv} VPN..." >> ${MM_LOGFILE} msg="Setting up the VPN Tunnel config" c=0; spc=''; spc1=$((${cw_spc}-${#msg})) until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done @@ -296,7 +295,7 @@ MMSTART(){ echo echo -e "${idsCL[Red]}Cannot get an WAN address, restarting system!${idsCL[Default]}" echo "$(date) - Cannot get an WAN address, restarting system! wanip(${REALWANIP}) vpnip(${mmip})" >> ${MM_LOGFILE} - [ $VERBOSE = true ] && echo "$(date) - Default Routes: zerogw(${zerogw}) defaultgw(${defaultgw})" >> ${MM_LOGFILE} + # [ $VERBOSE = true ] && echo "$(date) - Default Routes: zerogw(${zerogw}) defaultgw(${defaultgw})" >> ${MM_LOGFILE} SENDNOTICE "Network Failure" "Cannot get an WAN address, will try and restart the VPN" 1 touch ${TMPFOLDER}/mm.vpn.fail MMSTOP >/dev/null 2>&1