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-14 17:43:27 -05:00
parent 77abc3cc6c
commit 3859a8c4e2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
inc/services.inc
View File

@@ -60,8 +60,8 @@ Server did not start serving DNS requests within 20mins you moron...." 1
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
${SSHCMD} root@${nip} '[ "$(docker ps -q -f name='${docker}')" ] && docker stop '${docker} >/dev/null 2>&1 ${SSHCMD} root@${nip} '[ "$(docker ps -a -q -f name='${docker}')" ] && docker stop '${docker} >/dev/null 2>&1
[ "${docker}" == "authelia" ] && ${SSHCMD} root@${nip} '[ "$(docker ps -q -f name=auth_redis)" ] && docker stop auth_redis' >/dev/null 2>&1 [ "${docker}" == "authelia" ] && ${SSHCMD} root@${nip} '[ "$(docker ps -a -q -f name=auth_redis)" ] && docker stop auth_redis' >/dev/null 2>&1
fi fi
done done
done done
@@ -77,7 +77,7 @@ Server did not start serving DNS requests within 20mins you moron...." 1
fi fi
done done
for docker in "${!dockerstocheck}"; do for docker in "${!dockerstocheck}"; do
if [ ! "$(docker ps -q -f name=${docker})" ]; then if [ ! "$(docker ps -a -q -f name=${docker})" ]; then
[ "${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
fi fi
@@ -97,7 +97,7 @@ Server did not start serving DNS requests within 20mins you moron...." 1
fi fi
done done
for docker in "${!dockerstocheck}"; do for docker in "${!dockerstocheck}"; do
[ "$(docker ps -q -f name=${docker})" ] && docker stop ${docker} & >/dev/null 2>&1 [ "$(docker ps -a -q -f name=${docker})" ] && docker stop ${docker} & >/dev/null 2>&1
done done
[ -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ] && rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary [ -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary ] && rm -f ${NM_TMPFOLDER}/.singleserver.${1^^}.primary
# fi # fi

4
inc/status.inc
View File

@@ -771,7 +771,7 @@ STATUS_NODE(){
if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.disable ] && ([ ${SDCHK} == true ] || [ ${SDCHK} == primary ]); then if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.disable ] && ([ ${SDCHK} == true ] || [ ${SDCHK} == primary ]); then
[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}$spc${idsCL[Default]}: " [ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}$spc${idsCL[Default]}: "
if [ ! "$(${NCMD} docker ps -q -f name=${docker})" ]; then if [ ! "$(${NCMD} docker ps -a -q -f name=${docker})" ]; then
#if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.disable ] && ([ "${nip}" = "10.2.1.5" ] || [[ "${nip}" != *"10.2."* ]] || ([[ "${nip}" = *"10.2."* ]] && [ ! -f ${PW_TMPFOLDER}/OFF-vMS-Host1.down ])); then #if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.disable ] && ([ "${nip}" = "10.2.1.5" ] || [[ "${nip}" != *"10.2."* ]] || ([[ "${nip}" = *"10.2."* ]] && [ ! -f ${PW_TMPFOLDER}/OFF-vMS-Host1.down ])); then
if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.disable ]; then if [ ! -f ${NM_TMPFOLDER}/${nip}~${docker}.disable ]; then
@@ -802,7 +802,7 @@ STATUS_NODE(){
fi fi
touch ${NM_TMPFOLDER}/${nip}~${docker}.fix touch ${NM_TMPFOLDER}/${nip}~${docker}.fix
sleep 10s sleep 10s
if [ "$(${NCMD} docker ps -q -f name=${docker})" ]; then if [ "$(${NCMD} docker ps -a -q -f name=${docker})" ]; then
[ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[Green]}Running - Fixed" [ "${STATUS_ACTION}" != "check" ] && echo -en "${idsCL[Green]}Running - Fixed"
[ -f ${NM_TMPFOLDER}/${nip}~${docker}.sent ] && SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "'${docker}' ${NM_DOCKER_DESC[${docker}]} - is fixed" [ -f ${NM_TMPFOLDER}/${nip}~${docker}.sent ] && SENDNOTICE "${NM_HOSTNAMES[${nip}]}[${nip}]" "'${docker}' ${NM_DOCKER_DESC[${docker}]} - is fixed"
rm -f ${NM_TMPFOLDER}/${nip}~${docker}.* rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*