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

update

Browse Source
This commit is contained in:
David Schroeder
2023-11-29 14:02:01 -06:00
parent 8428c2eab4
commit ce771a4100
2 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='4.16.14-11292023' VERS='4.16.16-11292023'
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 ' 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 '
CERT_DAEMON='/snap/bin/certbot' CERT_DAEMON='/snap/bin/certbot'

42
inc/status.inc
View File

@@ -214,14 +214,21 @@ STATUS(){
[ "${NTYPE}" != "OFW" ] && srvctst=(`${NCMD} "systemctl is-active ${srvcstotest}"`) [ "${NTYPE}" != "OFW" ] && srvctst=(`${NCMD} "systemctl is-active ${srvcstotest}"`)
sr=0 sr=0
for srvc in "${!srvcs}"; do for srvc in "${!srvcs}"; do
if [ "${srvc}" == "gitea" ] && [ "${NTYPE}" == "WEB" ] && [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['WEB']}* ]]; then tmp=${NM_SINGLESRVR_SERVICES[${NTYPE}]}
NOGOCHK=false if [[ ${tmp[@]} =~ ${srvc} ]]; then
rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.* if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP[${NTYPE}]}* ]]; then
SSCHK=false
rm -f ${NM_TMPFOLDER}/${nip}~${srvc}.*
else
SSCHK=true
fi
else else
NOGOCHK=true SSCHK=true
fi fi
[ "${srvc}" == "keepalived" ] && ([ "${nip}" == "10.2.1.2" ] || [ "${nip}" == "10.2.1.51" ]) && NOGOCHK=false [ "${srvc}" == "keepalived" ] && ([ "${nip}" == "10.2.1.2" ] || [ "${nip}" == "10.2.1.51" ]) && NOGOCHK=false
if [ ${NOGOCHK} == true ]; then
if [ ${SSCHK} == true ]; then
if [ "${ST_ACTION}" != "check" ]; then if [ "${ST_ACTION}" != "check" ]; then
if [ "${ST_ACTION}" != "report" ]; then if [ "${ST_ACTION}" != "report" ]; then
c=0; cw=${PRI_CW}; spc=''; spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done c=0; cw=${PRI_CW}; spc=''; spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
@@ -303,31 +310,16 @@ STATUS(){
for docker in "${!dockers}"; do for docker in "${!dockers}"; do
tmp=${NM_SINGLESRVR_DOCKERS[${NTYPE}]} tmp=${NM_SINGLESRVR_DOCKERS[${NTYPE}]}
if [[ ${tmp[@]} =~ ${docker} ]]; then if [[ ${tmp[@]} =~ ${docker} ]]; then
if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['WEB']}* ]]; then if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP[${NTYPE}]}* ]]; then
echo "not primary - $nip - $docker" SSDCHK=false
else
echo "docker found - $nip - $docker"
fi
fi
if [ "${NTYPE}" == "WEB" ]; then
if ([ "${docker}" == "vaultwarden" ] || [ "${docker}" == "heimdall" ]) && [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['WEB']}* ]]; then
NOGOCHK=false
rm -f ${NM_TMPFOLDER}/${nip}~${docker}.* rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
else else
NOGOCHK=true SSDCHK=true
fi
elif [ "${NTYPE}" == "LB" ]; then
if [ "${docker}" == "authelia" ] && [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['LB']}* ]]; then
NOGOCHK=false
rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
else
NOGOCHK=true
fi fi
else else
NOGOCHK=true SSDCHK=true
fi fi
if [ ${NOGOCHK} == true ]; then if [ ${SSDCHK} == true ]; then
if [ "${ST_ACTION}" != "check" ]; then if [ "${ST_ACTION}" != "check" ]; then
if [ "${ST_ACTION}" != "report" ]; then if [ "${ST_ACTION}" != "report" ]; then
c=0; cw=${PRI_CW}; spc='' c=0; cw=${PRI_CW}; spc=''