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:06:22 -06:00
parent ce771a4100
commit 9c8611ad90
2 changed files with 10 additions and 5 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.16-11292023' VERS='4.16.17-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'

13
inc/status.inc
View File

@@ -292,6 +292,9 @@ STATUS(){
fi fi
fi fi
[ "${mysqlgo}" = "true" ] && unset mysqlgo [ "${mysqlgo}" = "true" ] && unset mysqlgo
else
echo -e "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled, not in primary role${idsCL[Default]}"
fi fi
sr=`expr $sr + 1` sr=`expr $sr + 1`
done done
@@ -311,15 +314,15 @@ STATUS(){
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[${NTYPE}]}* ]]; 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
SSDCHK=false SDCHK=false
rm -f ${NM_TMPFOLDER}/${nip}~${docker}.* rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
else else
SSDCHK=true SDCHK=true
fi fi
else else
SSDCHK=true SDCHK=true
fi fi
if [ ${SSDCHK} == true ]; then if [ ${SDCHK} == 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=''
@@ -378,6 +381,8 @@ STATUS(){
fi fi
rm -f ${NM_TMPFOLDER}/${nip}~${docker}.* rm -f ${NM_TMPFOLDER}/${nip}~${docker}.*
fi fi
else
echo -e "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}${spc}${idsCL[Default]}: ${idsCL[LightCyan]}Disabled, not in primary role${idsCL[Default]}"
fi fi
done done
fi fi