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

update

Browse Source
This commit is contained in:
David Schroeder
2023-10-25 19:00:43 -05:00
parent 06f07ee2ca
commit 0cdc5e548a
2 changed files with 9 additions and 6 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.12.41-10222023' VERS='4.12.42-10252023'
noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update ' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update '
CERT_DAEMON='/snap/bin/certbot' CERT_DAEMON='/snap/bin/certbot'

13
inc/status.inc
View File

@@ -1,6 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
STATUS(){ STATUS(){
start=`date +%s` start=`date +%s`
cw=40;
ST_ACTION=${1} ST_ACTION=${1}
if [ "${ST_ACTION}" = "sync" ]; then if [ "${ST_ACTION}" = "sync" ]; then
ST_ACTION=repl ST_ACTION=repl
@@ -58,7 +61,7 @@ STATUS(){
for srvc in "${LOCAL_SERVICES[@]}"; do for srvc in "${LOCAL_SERVICES[@]}"; do
if [ "${ST_ACTION}" != "check" ]; then if [ "${ST_ACTION}" != "check" ]; then
if [ "${ST_ACTION}" != "report" ]; then if [ "${ST_ACTION}" != "report" ]; then
c=0; cw=30; spc='' c=0; spc=''
spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]} spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]}
until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
else else
@@ -180,7 +183,7 @@ STATUS(){
if [ ${NOGOCHK} == true ]; then if [ ${NOGOCHK} == 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=30; spc=''; spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done c=0; cw=40; spc=''; spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
else else
spc=' ' spc=' '
fi fi
@@ -245,7 +248,7 @@ STATUS(){
# if [ ${NOGOCHK} = true ]; then # if [ ${NOGOCHK} = 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=30; spc='' # c=0; cw=40; spc=''
# spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]} # spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]}
# until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done # until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
# else # else
@@ -338,7 +341,7 @@ STATUS(){
if [ ${NOGOCHK} == true ]; then if [ ${NOGOCHK} == 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=30; spc='' c=0; spc=''
spc1=`expr ${cw} - ${#NM_DOCKER_DESC[${docker}]}` spc1=`expr ${cw} - ${#NM_DOCKER_DESC[${docker}]}`
until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
else else
@@ -486,7 +489,7 @@ STATUS(){
for rcheck in "${!var2}"; do for rcheck in "${!var2}"; do
if [ "${ST_ACTION}" != "check" ]; then if [ "${ST_ACTION}" != "check" ]; then
if [ "${ST_ACTION}" != "report" ]; then if [ "${ST_ACTION}" != "report" ]; then
c=0; cw=30; spc=''; spc1=${cw}-${#NM_REPL_DESC[${rcheck}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done c=0; spc=''; spc1=${cw}-${#NM_REPL_DESC[${rcheck}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
else else
spc=' ' spc=' '
fi fi