diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index dc0f4642..5f526e2a 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -1384,29 +1384,60 @@ HAPROXY-CONFIG() { echo -e "${idsCL[LightGreen]}Creating HAProxy Config Files${idsCL[Default]}" echo -e "${idsCL[LightGreen]}-------------------------------------------${idsCL[Default]}" nid=1 - if [[ "${NODESERVICES_CHECK}" = *"${1}"* ]]; then - for nip in "${NODE_HOSTS[@]}"; do - if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then - nip='localhost ' - NCMD='' - else - NCMD="ssh root@${nip}" - fi - echo -en "Creating File on iDS-MySQL${nid} ($nip)... ${idsCL[Default]}" - - ${NCMD} "nodemgmt update q" - ${NCMD} "rm -f /etc/haproxy/haproxy.cfg" - ${NCMD} "sed -e 's;%NIP%;${nip};g' ${FOLDER}/templates/haproxy.config > /etc/haproxy/haproxy.cfg" - - echo -e "${idsCL[Green]}COMPLETE${idsCL[Default]}" - nid=`expr $nid + 1` - done - fi + for nip in "${NODE_HOSTS[@]}"; do + if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then + nip='localhost ' + NCMD='' + else + NCMD="ssh root@${nip}" + fi + echo -en "Creating File on iDS-MySQL${nid} ($nip)... ${idsCL[Default]}" + + ${NCMD} "nodemgmt update q" + ${NCMD} "rm -f /etc/haproxy/haproxy.cfg" + ${NCMD} "sed -e 's;%NIP%;${nip};g' ${FOLDER}/templates/haproxy.config > /etc/haproxy/haproxy.cfg" + + echo -e "${idsCL[Green]}COMPLETE${idsCL[Default]}" + nid=`expr $nid + 1` + done SERVICE haproxy reload echo "" echo -e "${idsCL[Green]}HAProxy Config Files have been created.${idsCL[Default]}" echo "" } +NODEUPDATE() { + echo -e "${idsCL[LightGreen]}Updating All Nodes and Webservers${idsCL[Default]}" + echo -e "${idsCL[LightGreen]}-------------------------------------------${idsCL[Default]}" + nid=1 + for nip in "${NODE_HOSTS[@]}"; do + if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then + nip='localhost ' + NCMD='' + else + NCMD="ssh root@${nip}" + fi + echo -en "Updating iDS-MySQL${nid} ($nip)... ${idsCL[Default]}" + ${NCMD} "nodemgmt update q" + echo -e "${idsCL[Green]}COMPLETE${idsCL[Default]}" + nid=`expr $nid + 1` + done + nid=1 + for nip in "${WEB_HOSTS[@]}"; do + if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then + nip='localhost ' + NCMD='' + else + NCMD="ssh root@${nip}" + fi + echo -en "Updating iDS-Webserver${nid} ($nip)... ${idsCL[Default]}" + ${NCMD} "nodemgmt update q" + echo -e "${idsCL[Green]}COMPLETE${idsCL[Default]}" + nid=`expr $nid + 1` + done + echo "" + echo -e "${idsCL[Green]}All Nodes and Webservers have been Updated.${idsCL[Default]}" + echo "" +} GUI(){ DISP_HEADER true true @@ -1464,6 +1495,7 @@ if [ ${action-x} ]; then delsites) DELSITES;; newsite) NEWSITE ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14};; update) ;; + update-nodes) NODEUPDATE;; backup) BACKUP;; status) STATUS ${2};; status-check) STATUS-CHECK ${2};;