voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

update

Browse Source
This commit is contained in:
David Schroeder
2025-06-01 12:50:10 -05:00
parent 116913a8d0
commit 465bbc0ec1
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='5.5.10-06012025' VERS='5.5.12-06012025'
NM_BETA=false NM_BETA=false
noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck offsite-staticroute-fix ' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck offsite-staticroute-fix '

4
inc/status.inc
View File

@@ -629,7 +629,7 @@ STATUS_NODE(){
fi fi
tmp=${NM_SINGLESRVR_SERVICES[${NODETYPE}]} tmp=${NM_SINGLESRVR_SERVICES[${NODETYPE}]}
SSCHK=true SSCHK=true
if ${SSHCMD} root@${nip} [ -f ${NM_TMPFOLDER}/.skip ]; then if [ "$(GETSKIP ${nip} host)" == "true" ]; then
SSCHK=skip SSCHK=skip
elif [[ ${tmp[@]} =~ ${srvc} ]]; then elif [[ ${tmp[@]} =~ ${srvc} ]]; then
if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP[${NODETYPE}]}* ]]; then if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP[${NODETYPE}]}* ]]; then
@@ -688,7 +688,7 @@ STATUS_NODE(){
######################################### #########################################
############ SERVICE REPAIRS ############ ############ SERVICE REPAIRS ############
if [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ] && [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.fix ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.down)) -gt 120 ] && [ "$(GETSKIP ${nip} host)" == "false" ]; then if [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ] && [ ! -f ${NM_TMPFOLDER}/${nip}~${srvc}.fix ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${nip}~${srvc}.down)) -gt 90 ]; then
if [ "${srvc}" == "pihole-FTL" ]; then if [ "${srvc}" == "pihole-FTL" ]; then
${SSHCMD} root@${nip} 'pihole -r' & >/dev/null 2>&1 ${SSHCMD} root@${nip} 'pihole -r' & >/dev/null 2>&1
touch ${NM_TMPFOLDER}/${nip}~${srvc}.fix touch ${NM_TMPFOLDER}/${nip}~${srvc}.fix

2
nodemgmt-scripts.sh
View File

@@ -1433,7 +1433,7 @@ GUI(){
echo -e "}\n" echo -e "}\n"
exit 0 exit 0
else else
if [ ${#STATUSRUNS[@]} -lt 3 ] && [ ! -f ${NM_TMPFOLDER}/.skip ]; then if [ ${#STATUSRUNS[@]} -lt 3 ] && ([ ! -f ${NM_TMPFOLDER}/.skip ] || ([ -f ${NM_TMPFOLDER}/.skip ] && [ "${2}" != "report" ])); then
STATUS_START=$(date +%Y-%m-%d-%H-%M-%S) STATUS_START=$(date +%Y-%m-%d-%H-%M-%S)
STATUSRUN_TMPFOLDER="${NM_TMPFOLDER}/status-${STATUS_START}" STATUSRUN_TMPFOLDER="${NM_TMPFOLDER}/status-${STATUS_START}"
mkdir ${STATUSRUN_TMPFOLDER} mkdir ${STATUSRUN_TMPFOLDER}