diff options
-rw-r--r-- | conf.default/config.xml | 9 | ||||
-rw-r--r-- | etc/inc/vpn.inc | 2 | ||||
-rwxr-xr-x | usr/local/bin/ping_hosts.sh | 2 |
3 files changed, 1 insertions, 12 deletions
diff --git a/conf.default/config.xml b/conf.default/config.xml index a8b6056..c7a25cd 100644 --- a/conf.default/config.xml +++ b/conf.default/config.xml @@ -723,15 +723,6 @@ <who>root</who> <command>/usr/bin/nice -n20 /usr/local/bin/checkreload.sh</command> </item> - <item> - <minute>*/5</minute> - <hour>*</hour> - <mday>*</mday> - <month>*</month> - <wday>*</wday> - <who>root</who> - <command>/usr/bin/nice -n20 /etc/ping_hosts.sh</command> - </item> </cron> <wol> <!-- diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 902dede..facdf06 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -101,7 +101,7 @@ function vpn_ipsec_configure($ipchg = false) mwexec("/sbin/ifconfig enc0 up"); - /* get the automatic /etc/ping_hosts.sh ready */ + /* get the automatic ping_hosts.sh ready */ unlink_if_exists("{$g['vardb_path']}/ipsecpinghosts"); touch("{$g['vardb_path']}/ipsecpinghosts"); diff --git a/usr/local/bin/ping_hosts.sh b/usr/local/bin/ping_hosts.sh index 87bda45..8455015 100755 --- a/usr/local/bin/ping_hosts.sh +++ b/usr/local/bin/ping_hosts.sh @@ -76,7 +76,6 @@ for TOPING in $PINGHOSTS ; do if [ "$PREVIOUSSTATUS" = "DOWN" ]; then # Service restored if [ "$SERVICERESTOREDSCRIPT" != "" ]; then - echo "UP" > /var/db/pingstatus/$DSTIP echo "$DSTIP is UP, previous state was DOWN .. Running $SERVICERESTOREDSCRIPT" echo "$DSTIP is UP, previous state was DOWN .. Running $SERVICERESTOREDSCRIPT" | logger -p daemon.info -i -t PingMonitor sh -c $SERVICERESTOREDSCRIPT @@ -89,7 +88,6 @@ for TOPING in $PINGHOSTS ; do if [ "$PREVIOUSSTATUS" = "UP" ]; then # Service is down if [ "$FAILURESCRIPT" != "" ]; then - echo "DOWN" > /var/db/pingstatus/$DSTIP echo "$DSTIP is DOWN, previous state was UP .. Running $FAILURESCRIPT" echo "$DSTIP is DOWN, previous state was UP .. Running $FAILURESCRIPT" | logger -p daemon.info -i -t PingMonitor sh -c $FAILURESCRIPT |