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

update

Browse Source
This commit is contained in:
David Schroeder
2024-05-10 10:06:21 -05:00
parent 5e560095b4
commit f0bfc64fd7
2 changed files with 4 additions and 10 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.1.111-05102024' VERS='5.1.113-05102024'
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 '

12
inc/status.inc
View File

@@ -579,13 +579,7 @@ STATUS_NODE(){
SSCHK=primary SSCHK=primary
fi fi
else else
if [ "${srvc}" == "keepalived" ] && ([ "${nip}" == "10.2.1.2xx" ] || [ "${nip}" == "10.2.1.51xx" ]); then SSCHK=true
SSCHK=false
elif [ "${nip}" == "10.2.1.5" ] && ([ "${srvc}" == "syncthing@pdns" ]); then
SSCHK=false
else
SSCHK=true
fi
fi fi
if [ ${SSCHK} != false ]; then if [ ${SSCHK} != false ]; then
@@ -645,7 +639,7 @@ STATUS_NODE(){
[ "${mysqlgo}" == "true" ] && unset mysqlgo [ "${mysqlgo}" == "true" ] && unset mysqlgo
[ "${SSCHK}" == "primary" ] && echo -e "${idsCL[LightCyan]} - Primary Node${idsCL[Default]}" || echo -e "${idsCL[Default]}" [ "${SSCHK}" == "primary" ] && echo -e "${idsCL[LightCyan]} - Primary Node${idsCL[Default]}" || echo -e "${idsCL[Default]}"
elif [ -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ] || ([ "${nip}" != "10.2.1.5" ] && [[ "${nip}" = *"10.2."* ]] && [ -f ${PW_TMPFOLDER}/OFF-vMS-Host1.down ]) || ([ "${srvc}" == "keepalived" ] && [ "${nip}" == "10.2.1.51" ]) || ([ "${nip}" == "10.2.1.5" ] && ([ "${srvc}" == "syncthing@pdns" ])); then elif [ -f ${NM_TMPFOLDER}/${nip}~${srvc}.disable ] || ([ "${nip}" != "10.2.1.5" ] && [[ "${nip}" = *"10.2."* ]] && [ -f ${PW_TMPFOLDER}/OFF-vMS-Host1.down ]) || ([ "${srvc}" == "keepalived" ] && [ "${nip}" == "10.2.1.51" ]); then
echo -e "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled${idsCL[Default]}" echo -e "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled${idsCL[Default]}"
else else
@@ -830,7 +824,7 @@ REPLCHECK(){
timeout=`date --date='1 minutes' +%s` timeout=`date --date='1 minutes' +%s`
# timeout=`date --date='30 seconds' +%s` # timeout=`date --date='30 seconds' +%s`
if [ "${nip}" == "10.2.1.5" ] && ([ "${rcheck}" == "pdns" ] || [ "${rcheck}" == "pdnsadmin" ]); then if [ "${nip}" == "10.2.1.5xxx" ] && ([ "${rcheck}" == "pdns" ] || [ "${rcheck}" == "pdnsadmin" ]); then
rm -f ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.running rm -f ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.running
touch ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.skip touch ${STATUSRUN_TMPFOLDER}/repl.${rcheck}.${nip}.skip
else else