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

update

Browse Source
This commit is contained in:
David Schroeder
2024-02-19 09:08:02 -06:00
parent 3d540f90b4
commit 410dbe476d
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='5.1.88-02102024' VERS='5.1.89-02192024'
NM_BETA=false NM_BETA=false
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 betacheck ' 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 betacheck '

14
nodemgmt-scripts.sh
View File

@@ -1073,7 +1073,7 @@ SETUPSSH(){
echo -e "\n${idsST[Bold]}${idsCL[LightCyan]}Beginning SSH verifiication, you may get prompted for credentials along the way\n" echo -e "\n${idsST[Bold]}${idsCL[LightCyan]}Beginning SSH verifiication, you may get prompted for credentials along the way\n"
for NTYPE in "${NM_NODE_TYPES[@]}"; do for NTYPE in "${NM_NODE_TYPES[@]}"; do
echo -e "${idsST[Bold]}"; DIVIDER echo -e "${idsST[Bold]}"; DIVIDER
echo -e "${idsCL[Yellow]} ${NM_NODETYPES[$NTYPE]}-Nodes - Verifying SSH Connection${idsCL[Default]}" echo -e "${idsCL[Yellow]} ${NM_NODETYPES[$NTYPE]}-Nodes - Verifying SSH Connections Between All Nodes${idsCL[Default]}"
DIVIDER; echo -e "${idsST[Reset]}" DIVIDER; echo -e "${idsST[Reset]}"
var=${NTYPE}_HOSTS[@] var=${NTYPE}_HOSTS[@]
for nip in "${!var}"; do for nip in "${!var}"; do
@@ -1089,6 +1089,8 @@ SETUPSSH(){
ssh-copy-id root@${nip} ssh-copy-id root@${nip}
fi fi
ssh -o BatchMode=yes -o ConnectTimeout=3 root@${nip} nmg setupssh_back
# echo -en "\n${idsCL[LightCyan]}Verifying NodeMgmt ... ${idsCL[Default]}" # echo -en "\n${idsCL[LightCyan]}Verifying NodeMgmt ... ${idsCL[Default]}"
# NODEUPDATE ${nip} verify "ssh" # NODEUPDATE ${nip} verify "ssh"
@@ -1109,6 +1111,15 @@ SETUPSSH(){
fi fi
done done
} }
SETUPSSH_BACK(){
echo -en "\n${idsCL[LightCyan]}Checking for Public SSH Key back to Node-Manager ... ${idsCL[Default]}"
if [ "$(ssh -o BatchMode=yes -o ConnectTimeout=3 root@10.10.10.60 echo ok 2>&1)" == "ok" ]; then
echo -e "${idsCL[Green]}Already Installed${idsCL[Default]}"
else
echo -e "${idsCL[Yellow]}Copying to Node-Manager ...${idsCL[Default]}"
ssh-copy-id root@10.10.10.60
fi
}
BETACHECK(){ BETACHECK(){
[ "$(curl -sL https://git.schroedercity.com/voltron/NodeMgmt/raw/branch/master/defaults.inc | grep NM_BETA=true)" != "" ] && echo true || echo false [ "$(curl -sL https://git.schroedercity.com/voltron/NodeMgmt/raw/branch/master/defaults.inc | grep NM_BETA=true)" != "" ] && echo true || echo false
@@ -1199,6 +1210,7 @@ GUI(){
fi fi
;; ;;
setupssh) SETUPSSH ${2} ${3} ${4} ${5} ${6};; setupssh) SETUPSSH ${2} ${3} ${4} ${5} ${6};;
setupssh_back) SETUPSSH_BACK ${2} ${3} ${4} ${5} ${6};;
betacheck) BETACHECK;; betacheck) BETACHECK;;
update-dyndns) UPDATE_DYNDNS ${2} ${3} ${4} ${5} ${6};; update-dyndns) UPDATE_DYNDNS ${2} ${3} ${4} ${5} ${6};;
backup) BACKUP;; backup) BACKUP;;