From 94a4bfe599082dd2379d443168642537a81b5d45 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 18 Oct 2023 08:58:41 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- inc/services.inc | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/defaults.inc b/defaults.inc index 44b4261f..32da2599 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.12.29-10122023' +VERS='4.12.31-10182023' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update ' CERT_DAEMON='/snap/bin/certbot' diff --git a/inc/services.inc b/inc/services.inc index 22dc660f..d68e7392 100755 --- a/inc/services.inc +++ b/inc/services.inc @@ -304,7 +304,11 @@ SERVICE(){ NOGOCHK=true; # if [ "${1}" == "gitea" ] || [ "${1}" == "pdnsadmin" ] || [ "${1}" == "pdnsadmin.socket" ]; then if [ "${1}" == "gitea" ]; then - if [[ $($NCMD ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) != *10.10.1.120* ]]; then + if [[ $($NCMD ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['WEB']}* ]]; then + NOGOCHK=false; + fi + elif [ "${1}" == "headscale" ]; then + if [[ $($NCMD ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['HS']}* ]]; then NOGOCHK=false; fi fi