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-09 16:48:39 -05:00
parent 1681d3f465
commit 07c4436855
3 changed files with 14 additions and 11 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.27-10092023' VERS='4.12.28-10092023'
noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense ' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense '
CERT_DAEMON='/snap/bin/certbot' CERT_DAEMON='/snap/bin/certbot'

15
inc/status.inc
View File

@@ -2,12 +2,7 @@
STATUS(){ STATUS(){
start=`date +%s` start=`date +%s`
ST_ACTION=${1} ST_ACTION=${1}
if [ "${1}" == "report" ] || [ "${2}" == "report" ] || [ "${3}" == "report" ]; then if [ "${ST_ACTION}" = "sync" ]; then
unset idsCL idsBG idsST
idsCL=('')
idsBG=('')
idsST=('')
elif [ "${ST_ACTION}" = "sync" ]; then
ST_ACTION=repl ST_ACTION=repl
fi fi
declare -i cw; declare -i spc1; declare -i c declare -i cw; declare -i spc1; declare -i c
@@ -613,12 +608,14 @@ It was down for $(SHOW_TIME ${toterrtime})"
DIVIDER false green DIVIDER false green
fi fi
[ "${ST_ACTION}" != "check" ] && echo -en " ${idsCL[LightCyan]}Getting drives from server ... ${idsCL[Default]}" [ "${ST_ACTION}" != "check" ] && [ "${2}" != "report" ] && echo -en " ${idsCL[LightCyan]}Getting drives from server ... ${idsCL[Default]}"
declare -A partitions declare -A partitions
DRIVEINFO=$(ssh root@${nip} df -BM | grep -vE '^Filesystem|tmpfs|cdrom|@|ram|loop|udev|veeamimage|nvme|localhost|shm|mmcblk|overlay|-volume|Music|Software' | awk '{ print $1 " " $2 " " $4 }') DRIVEINFO=$(ssh root@${nip} df -BM | grep -vE '^Filesystem|tmpfs|cdrom|@|ram|loop|udev|veeamimage|nvme|localhost|shm|mmcblk|overlay|-volume|Music|Software' | awk '{ print $1 " " $2 " " $4 }')
DRIVEINFO=(${DRIVEINFO}) DRIVEINFO=(${DRIVEINFO})
echo -en "\e[1A"; if [ "${2}" != "report" ]; then
echo -e "\e[0K\r" echo -en "\e[1A"
echo -e "\e[0K\r"
fi
NUMDRIVES=$((${#DRIVEINFO[@]} / 3)) NUMDRIVES=$((${#DRIVEINFO[@]} / 3))
for ((i = 0 ; i <= $((${NUMDRIVES}-1)) ; i++)); do for ((i = 0 ; i <= $((${NUMDRIVES}-1)) ; i++)); do

8
nodemgmt-scripts.sh
View File

@@ -15,6 +15,12 @@ source /opt/idssys/nodemgmt/inc/sites.inc
source /opt/idssys/nodemgmt/inc/services.inc source /opt/idssys/nodemgmt/inc/services.inc
if [ "${1}" == "report" ] || [ "${2}" == "report" ] || [ "${3}" == "report" ]; then
unset idsCL idsBG idsST
idsCL=('')
idsBG=('')
idsST=('')
fi
BACKUP(){ BACKUP(){
@@ -834,7 +840,7 @@ GUI(){
done done
} }
# if [ ${action-x} ]; then # if [ ${action-x} ]; then
if [[ "${noheader}" != *" ${action} "* ]] && [[ "${noheader}" != *" ${2} "* ]] && [ "${2}" != "q" ] && [ "${3}" != "q" ] && [ "${1}" != "gui" ] && [ "${1}" != "nightlyrenew" ] && [ "${1}" != "update" ]; then if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]] && [ "${2}" != "q" ] && [ "${3}" != "q" ] && [ "${1}" != "gui" ] && [ "${1}" != "nightlyrenew" ] && [ "${1}" != "update" ]; then
DISP_HEADER DISP_HEADER
fi fi
case $action in case $action in