diff --git a/omr-tracker/files/etc/uci-defaults/omr-tracker b/omr-tracker/files/etc/uci-defaults/omr-tracker index 9fc89a488..5c495ca86 100755 --- a/omr-tracker/files/etc/uci-defaults/omr-tracker +++ b/omr-tracker/files/etc/uci-defaults/omr-tracker @@ -142,5 +142,12 @@ if [ "$(uci -q get omr-tracker.server.type)" = "" ]; then commit omr-tracker EOF fi +if [ -z "$(uci -q get omr-tracker.omrvpn.restart_down)" ]; then + uci -q batch <<-EOF >/dev/null + set omr-tracker.omrvpn.restart_down='0' + commit omr-tracker + EOF +fi + exit 0 \ No newline at end of file diff --git a/omr-tracker/files/usr/share/omr/post-tracking.d/002-error b/omr-tracker/files/usr/share/omr/post-tracking.d/002-error index d044dc982..a587cec71 100755 --- a/omr-tracker/files/usr/share/omr/post-tracking.d/002-error +++ b/omr-tracker/files/usr/share/omr/post-tracking.d/002-error @@ -236,18 +236,6 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || { [ "$OMR_TRACKER_INTERFACE" != "omrvp fi [ -n "$script_alert_down" ] && eval $script_alert_down - restart_down="" - if [ -n "$OMR_TRACKER_INTERFACE" ]; then - restart_down="$(uci -q get omr-tracker.$OMR_TRACKER_INTERFACE.restart_down)" - fi - [ -z "$restart_down" ] && restart_down="$(uci -q get omr-tracker.defaults.restart_down)" - [ "$restart_down" = "1" ] && { - _log "Restart $OMR_TRACKER_INTERFACE" - ifdown $OMR_TRACKER_INTERFACE >/dev/null 2>&1 - sleep 5 - ifup $OMR_TRACKER_INTERFACE >/dev/null 2>&1 - } - if [ "$OMR_TRACKER_INTERFACE" = "glorytun" ] || [ "$OMR_TRACKER_INTERFACE" = "omrvpn" ] || [ "$OMR_TRACKER_INTERFACE" = "omr6in4" ]; then if [ "$OMR_TRACKER_STATUS_MSG" = "" ]; then _log "$OMR_TRACKER_INTERFACE down" @@ -300,6 +288,18 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || { [ "$OMR_TRACKER_INTERFACE" != "omrvp config_foreach set_server_default_route6 server fi fi + restart_down="" + if [ -n "$OMR_TRACKER_INTERFACE" ]; then + restart_down="$(uci -q get omr-tracker.$OMR_TRACKER_INTERFACE.restart_down)" + fi + [ -z "$restart_down" ] && restart_down="$(uci -q get omr-tracker.defaults.restart_down)" + [ "$restart_down" = "1" ] && { + _log "Restart $OMR_TRACKER_INTERFACE" + ifdown $OMR_TRACKER_INTERFACE >/dev/null 2>&1 + sleep 5 + ifup $OMR_TRACKER_INTERFACE >/dev/null 2>&1 + } + dns_flush if [ -n "$OMR_TRACKER_INTERFACE" ]; then uci -q delete openmptcprouter.$OMR_TRACKER_INTERFACE.lc