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-11 23:14:37 -05:00
parent c402260122
commit c7fd86be6b
2 changed files with 95 additions and 65 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.18-06102025' VERS='5.5.19-06112025'
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 '

30
inc/services.inc
View File

@@ -1,12 +1,19 @@
#!/usr/bin/env bash #!/usr/bin/env bash
SINGLE_SERVER_SERVICE_CHECK(){ SINGLE_SERVER_SERVICE_CHECK(){
[ -f ${NM_TMPFOLDER}/.singleserver.${1^^}.check ] && [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.singleserver.${1^^}.check)) -ge 1200 ] && rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.check
if [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.check ]; then
touch ${NM_TMPFOLDER}/.singleserver.${1^^}.check
servicestocheck=${1^^}_SINGLESRVR_SERVICES[@] servicestocheck=${1^^}_SINGLESRVR_SERVICES[@]
dockerstocheck=${1^^}_SINGLESRVR_DOCKERS[@] dockerstocheck=${1^^}_SINGLESRVR_DOCKERS[@]
hosts=${1^^}_HOSTS[@] hosts=${1^^}_HOSTS[@]
[ "${2^^}" == "START" ] && rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary [ "${2^^}" == "START" ] && rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary
# rm -f ${NM_TMPFOLDER}/.singleserver* # rm -f ${NM_TMPFOLDER}/.singleserver*
if [ ! -f ${NM_TMPFOLDER}/.skip ] && ([[ "$(declare -p ${1^^}_SINGLESRVR_SERVICES)" =~ "declare -a" ]] || [[ "$(declare -p ${1^^}_SINGLESRVR_DOCKERS)" =~ "declare -a" ]]); then if [ ! -f ${NM_TMPFOLDER}/.skip ] && ([[ "$(declare -p ${1^^}_SINGLESRVR_SERVICES)" =~ "declare -a" ]] || [[ "$(declare -p ${1^^}_SINGLESRVR_DOCKERS)" =~ "declare -a" ]]); then
@@ -56,6 +63,26 @@ SINGLE_SERVER_SERVICE_CHECK(){
echo "$(date +%Y-%m-%d-%H-%M-%S) - ${NM_HOSTNAMES[${RUN_NODE_IP}]} - ... Done" >> ${NM_LOGFILE} echo "$(date +%Y-%m-%d-%H-%M-%S) - ${NM_HOSTNAMES[${RUN_NODE_IP}]} - ... Done" >> ${NM_LOGFILE}
# fi # fi
if [ "${1^^}" == "LPD" ]; then
/usr/local/bin/nmg skip on >/dev/null 2>&1
completed=false; scanstart=$(date +%s)
until [ "${completed}" == "true" ]; do
dnstest=$(dig +short www.google.com @127.0.0.1)
if [ "${dnstest}" != "" ]; then
completed=true
break
elif [ $(($(date +%s)-scanstart)) -gt 1200 ]; then
SENDNOTICE "${NM_HOSTNAMES[${RUN_NODE_IP}]} DNS Startup Failure" "${NM_HOSTNAMES[${RUN_NODE_IP}]} (${RUN_NODE_IP})
Server did not start serving DNS requests within 20mins you moron...." 1
killall bash
exit 1
fi
sleep 15s
done
/usr/local/bin/nmg skip off >/dev/null 2>&1
fi
else else
# if [ -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ] || [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary)) -ge 300 ]; then # if [ -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ] || [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary)) -ge 300 ]; then
[ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary ] && touch ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary ] && touch ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary
@@ -78,6 +105,9 @@ SINGLE_SERVER_SERVICE_CHECK(){
systemctl stop keepalived >/dev/null 2>&1 systemctl stop keepalived >/dev/null 2>&1
fi fi
rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.check
fi
} }
SERVICE_MGMT(){ SERVICE_MGMT(){