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

update

Browse Source
This commit is contained in:
David Schroeder
2024-11-29 18:30:33 -06:00
parent 803d910acc
commit 7003f5d1ae
2 changed files with 29 additions and 28 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.3.11-11292024' VERS='5.3.12-11292024'
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 '

55
inc/services.inc
View File

@@ -5,51 +5,51 @@ SINGLE_SERVER_SERVICE_CHECK(){
dockerstocheck=${1^^}_SINGLESRVR_DOCKERS[@] dockerstocheck=${1^^}_SINGLESRVR_DOCKERS[@]
hosts=${1^^}_HOSTS[@] hosts=${1^^}_HOSTS[@]
[ "${2^^}" == "START" ] && rm -f ${NM_TMPFOLDER}/.singleserver.${1^^} [ "${2^^}" == "START" ] && rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary
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
if [[ $(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) == *${NM_SINGLESRVR_IP[${1^^}]}* ]]; then if [[ $(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) == *${NM_SINGLESRVR_IP[${1^^}]}* ]]; then
if [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^} ]; then if [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.singleserver.${1^^}.primary)) -ge 900 ]; then
SENDNOTICE "Node-Balancing Notice" "Starting SingleServer Services/Dockers on ${NM_HOSTNAMES[${RUN_NODE_IP}]} (${RUN_NODE_IP}), stopping on other Nodes" if [ ! -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ]; then
echo "$(date +%Y-%m-%d-%H-%M-%S) - ${NM_HOSTNAMES[${RUN_NODE_IP}]} - Starting SingleServer Services/Dockers on ${NM_HOSTNAMES[${RUN_NODE_IP}]} (${RUN_NODE_IP}), stopping on the other Nodes ..." >> ${NM_LOGFILE} touch ${NM_TMPFOLDER}/.singleserver.${1^^}.primary
touch ${NM_TMPFOLDER}/.singleserver.${1^^} SENDNOTICE "Node-Balancing Notice" "Starting SingleServer Services/Dockers on ${NM_HOSTNAMES[${RUN_NODE_IP}]} (${RUN_NODE_IP}), stopping on other Nodes"
echo "$(date +%Y-%m-%d-%H-%M-%S) - ${NM_HOSTNAMES[${RUN_NODE_IP}]} - Starting SingleServer Services/Dockers on ${NM_HOSTNAMES[${RUN_NODE_IP}]} (${RUN_NODE_IP}), stopping on the other Nodes ..." >> ${NM_LOGFILE}
for stc in "${!servicestocheck}"; do for stc in "${!servicestocheck}"; do
[ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.service pdnsadmin.socket" [ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.service pdnsadmin.socket"
for nip in "${!hosts}"; do for nip in "${!hosts}"; do
if [[ "${RUN_NODE_IP}" != *"${nip}"* ]] && [ "$(CHECK_HOST ${nip})" != "false" ]; then if [[ "${RUN_NODE_IP}" != *"${nip}"* ]] && [ "$(CHECK_HOST ${nip})" != "false" ]; then
ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} /bin/systemctl stop ${stc} >/dev/null 2>&1 ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} /bin/systemctl stop ${stc} >/dev/null 2>&1
ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} rm -f ${NM_TMPFOLDER}/.singleserver.${1^^} >/dev/null 2>&1 ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary >/dev/null 2>&1
fi fi
done
done done
done for docker in "${!dockerstocheck}"; do
for docker in "${!dockerstocheck}"; do for nip in "${!hosts}"; do
for nip in "${!hosts}"; do if [[ "${RUN_NODE_IP}" != *"${nip}"* ]] && [ "$(CHECK_HOST ${nip})" != "false" ]; then
if [[ "${RUN_NODE_IP}" != *"${nip}"* ]] && [ "$(CHECK_HOST ${nip})" != "false" ]; then ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} docker stop ${docker} >/dev/null 2>&1
ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} docker stop ${docker} >/dev/null 2>&1 [ "${docker}" == "authelia" ] && ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} docker stop auth_redis >/dev/null 2>&1
[ "${docker}" == "authelia" ] && ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} docker stop auth_redis >/dev/null 2>&1 fi
fi done
done done
done sleep 20s
else
sleep 20s touch ${NM_TMPFOLDER}/.singleserver.${1^^}.primary
fi
for stc in "${!servicestocheck}"; do for stc in "${!servicestocheck}"; do
[ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.service pdnsadmin.socket" [ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.service pdnsadmin.socket"
/bin/systemctl start ${stc} >/dev/null 2>&1 /bin/systemctl start ${stc} >/dev/null 2>&1
done done
for docker in "${!dockerstocheck}"; do for docker in "${!dockerstocheck}"; do
[ "${docker}" == "authelia" ] && docker start auth_redis && sleep 2s >/dev/null 2>&1 [ "${docker}" == "authelia" ] && docker start auth_redis && sleep 2s >/dev/null 2>&1
docker start ${docker} >/dev/null 2>&1 docker start ${docker} >/dev/null 2>&1
done done
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
else else
if [ -f ${NM_TMPFOLDER}/.singleserver.${1^^} ]; 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 900 ]; then
for stc in "${!servicestocheck}"; do for stc in "${!servicestocheck}"; do
[ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.socket pdnsadmin.service" [ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.socket pdnsadmin.service"
/bin/systemctl stop ${stc} & >/dev/null 2>&1 /bin/systemctl stop ${stc} & >/dev/null 2>&1
@@ -57,7 +57,8 @@ SINGLE_SERVER_SERVICE_CHECK(){
for docker in "${!dockerstocheck}"; do for docker in "${!dockerstocheck}"; do
docker stop ${docker} & >/dev/null 2>&1 docker stop ${docker} & >/dev/null 2>&1
done done
rm -f ${NM_TMPFOLDER}/.singleserver.${1^^} rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary
touch ${NM_TMPFOLDER}/.singleserver.${1^^}.secondary
fi fi
fi fi