From be12ebfd642ef3ec637fae390783d6a9bd2be939 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 24 May 2023 23:28:27 -0500 Subject: [PATCH] update --- inc/sites.inc | 120 ++++++++++++++++++++++++-------------------- nodemgmt-scripts.sh | 1 + 2 files changed, 67 insertions(+), 54 deletions(-) diff --git a/inc/sites.inc b/inc/sites.inc index bbfd8bdc..c077c398 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -446,65 +446,77 @@ VIEWSITEINFO(){ cw_spc5=7 cw_spc6=8 cw_spc7=15 + MIP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) + for NTYPE in "${NODE_TYPES[@]}"; do + var=${NTYPE}_HOSTS[@] + NODE_TYPE="" + for nip in "${!var}"; do + if [[ "${MIP}" == *"${nip}"* ]]; then + NODE_TYPE=${NTYPE}; + break 2 + fi + done + done echo -e "${idsCL[LightGreen]}Site Information ${idsCL[Default]}" - if [ "${1}" == "lb" ]; then - gosite=${LB_NGINX_SITES} - elif [ "${1}" == "web" ]; then - gosite=${WEB_NGINX_SITES} + gosite=${NODE_TYPE}_NGINX_SITES + + if [ "${!gosite}" != "" ]; then + sites=$(find ${gosite}/*); i=0 + for sitefile in ${sites[@]}; do + site=${sitefile##*/}; site=${site/.conf/} + + if (( i % 12 == 0 )) || [ $i = 0 ]; then + DIVIDER false yellow 94 + msg1="Site Address"; c=0; spc1=''; spct=$((${cw_spc1}-${#msg1})); until [ $c = ${spct} ]; do spc1="${spc1} "; c=`expr $c + 1`; done + msg2="Type"; c=0; spc2=''; spct=$((${cw_spc2}-${#msg2})); until [ $c = ${spct} ]; do spc2="${spc2} "; c=`expr $c + 1`; done + msg3="SSL"; c=0; spc3=''; spct=$((${cw_spc3}-${#msg3})); until [ $c = ${spct} ]; do spc3="${spc3} "; c=`expr $c + 1`; done + msg4="HSTS"; c=0; spc4=''; spct=$((${cw_spc4}-${#msg4})); until [ $c = ${spct} ]; do spc4="${spc4} "; c=`expr $c + 1`; done + msg5="WBSKT"; c=0; spc5=''; spct=$((${cw_spc5}-${#msg5})); until [ $c = ${spct} ]; do spc5="${spc5} "; c=`expr $c + 1`; done + msg6="LOCK"; c=0; spc6=''; spct=$((${cw_spc6}-${#msg6})); until [ $c = ${spct} ]; do spc6="${spc6} "; c=`expr $c + 1`; done + msg7="Proxy Address & Port"; + echo -e "${idsST[Bold]}${idsCL[LightCyan]}${msg1}${spc1}${msg2}${spc2}${msg3}${spc3}${msg4}${spc4}${msg5}${spc5}${msg6}${spc6}${msg7}${idsST[Reset]}${idsCL[Default]}" + DIVIDER false yellow 94 + else + DIVIDER false darkGray 94 + fi + if [ "$(grep include/proxy.conf ${sitefile})" != "" ]; then + type='Proxy' + server=$(grep 'set $server' ${sitefile}) + server=${server#*\"}; server=${server%\"*} + port=$(grep 'set $port' ${sitefile}) + port=${port##* }; port=${port%;*} + c=0; spc7=''; spct=$((${cw_spc7}-${#server})); until [ $c = ${spct} ]; do spc7="${spc7} "; c=`expr $c + 1`; done + proxyhost="${server}${spc7}:${port}" + else + type='HTTP' + proxyhost='' + fi + [ "$(grep ssl_certificate ${sitefile})" != "" ] && ssl='Yes' || ssl='' + [ "$(grep include/hsts-support.conf ${sitefile})" != "" ] && hsts='Yes' || hsts='' + [ "$(grep include/websocket-support.conf ${sitefile})" != "" ] && wbskt='Yes' || wbskt='' + [ "$(grep include/secure-access.conf ${sitefile})" != "" ] && lock='Yes' || lock='' + + + + msg1="${site}"; c=0; spc1=''; spct=$((${cw_spc1}-${#msg1})); until [ $c = ${spct} ]; do spc1="${spc1} "; c=`expr $c + 1`; done + msg2="${type}"; c=0; spc2=''; spct=$((${cw_spc2}-${#msg2})); until [ $c = ${spct} ]; do spc2="${spc2} "; c=`expr $c + 1`; done + msg3="${ssl}"; c=0; spc3=''; spct=$((${cw_spc3}-${#msg3})); until [ $c = ${spct} ]; do spc3="${spc3} "; c=`expr $c + 1`; done + msg4="${hsts}"; c=0; spc4=''; spct=$((${cw_spc4}-${#msg4})); until [ $c = ${spct} ]; do spc4="${spc4} "; c=`expr $c + 1`; done + msg5="${wbskt}"; c=0; spc5=''; spct=$((${cw_spc5}-${#msg5})); until [ $c = ${spct} ]; do spc5="${spc5} "; c=`expr $c + 1`; done + msg6="${lock}"; c=0; spc6=''; spct=$((${cw_spc6}-${#msg6})); until [ $c = ${spct} ]; do spc6="${spc6} "; c=`expr $c + 1`; done + msg7="${proxyhost}"; + + echo -e "${msg1}${spc1}${msg2}${spc2}${msg3}${spc3}${msg4}${spc4}${msg5}${spc5}${msg6}${spc6}${msg7}" + + i=`expr $i + 1` + done + + else - exit 0 + echo "No site information found" fi - sites=$(find ${gosite}/*); i=0 - for sitefile in ${sites[@]}; do - site=${sitefile##*/}; site=${site/.conf/} - - if (( i % 12 == 0 )) || [ $i = 0 ]; then - DIVIDER false yellow 94 - msg1="Site Address"; c=0; spc1=''; spct=$((${cw_spc1}-${#msg1})); until [ $c = ${spct} ]; do spc1="${spc1} "; c=`expr $c + 1`; done - msg2="Type"; c=0; spc2=''; spct=$((${cw_spc2}-${#msg2})); until [ $c = ${spct} ]; do spc2="${spc2} "; c=`expr $c + 1`; done - msg3="SSL"; c=0; spc3=''; spct=$((${cw_spc3}-${#msg3})); until [ $c = ${spct} ]; do spc3="${spc3} "; c=`expr $c + 1`; done - msg4="HSTS"; c=0; spc4=''; spct=$((${cw_spc4}-${#msg4})); until [ $c = ${spct} ]; do spc4="${spc4} "; c=`expr $c + 1`; done - msg5="WBSKT"; c=0; spc5=''; spct=$((${cw_spc5}-${#msg5})); until [ $c = ${spct} ]; do spc5="${spc5} "; c=`expr $c + 1`; done - msg6="LOCK"; c=0; spc6=''; spct=$((${cw_spc6}-${#msg6})); until [ $c = ${spct} ]; do spc6="${spc6} "; c=`expr $c + 1`; done - msg7="Proxy Address & Port"; - echo -e "${idsST[Bold]}${idsCL[LightCyan]}${msg1}${spc1}${msg2}${spc2}${msg3}${spc3}${msg4}${spc4}${msg5}${spc5}${msg6}${spc6}${msg7}${idsST[Reset]}${idsCL[Default]}" - DIVIDER false yellow 94 - else - DIVIDER false darkGray 94 - fi - if [ "$(grep include/proxy.conf ${sitefile})" != "" ]; then - type='Proxy' - server=$(grep 'set $server' ${sitefile}) - server=${server#*\"}; server=${server%\"*} - port=$(grep 'set $port' ${sitefile}) - port=${port##* }; port=${port%;*} - c=0; spc7=''; spct=$((${cw_spc7}-${#server})); until [ $c = ${spct} ]; do spc7="${spc7} "; c=`expr $c + 1`; done - proxyhost="${server}${spc7}:${port}" - else - type='HTTP' - proxyhost='' - fi - [ "$(grep ssl_certificate ${sitefile})" != "" ] && ssl='Yes' || ssl='' - [ "$(grep include/hsts-support.conf ${sitefile})" != "" ] && hsts='Yes' || hsts='' - [ "$(grep include/websocket-support.conf ${sitefile})" != "" ] && wbskt='Yes' || wbskt='' - [ "$(grep include/secure-access.conf ${sitefile})" != "" ] && lock='Yes' || lock='' - - - - msg1="${site}"; c=0; spc1=''; spct=$((${cw_spc1}-${#msg1})); until [ $c = ${spct} ]; do spc1="${spc1} "; c=`expr $c + 1`; done - msg2="${type}"; c=0; spc2=''; spct=$((${cw_spc2}-${#msg2})); until [ $c = ${spct} ]; do spc2="${spc2} "; c=`expr $c + 1`; done - msg3="${ssl}"; c=0; spc3=''; spct=$((${cw_spc3}-${#msg3})); until [ $c = ${spct} ]; do spc3="${spc3} "; c=`expr $c + 1`; done - msg4="${hsts}"; c=0; spc4=''; spct=$((${cw_spc4}-${#msg4})); until [ $c = ${spct} ]; do spc4="${spc4} "; c=`expr $c + 1`; done - msg5="${wbskt}"; c=0; spc5=''; spct=$((${cw_spc5}-${#msg5})); until [ $c = ${spct} ]; do spc5="${spc5} "; c=`expr $c + 1`; done - msg6="${lock}"; c=0; spc6=''; spct=$((${cw_spc6}-${#msg6})); until [ $c = ${spct} ]; do spc6="${spc6} "; c=`expr $c + 1`; done - msg7="${proxyhost}"; - - echo -e "${msg1}${spc1}${msg2}${spc2}${msg3}${spc3}${msg4}${spc4}${msg5}${spc5}${msg6}${spc6}${msg7}" - - i=`expr $i + 1` - done echo } diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 6b552fbc..16e853e7 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -1336,6 +1336,7 @@ GUI(){ echo -e " ${idsCL[Yellow]}service${idsCL[Default]} [service] [action] - Manages services accross like nodes" echo -e " ${idsCL[Yellow]}services${idsCL[Default]} - (UI) Manage services accross all nodes" echo -e " ${idsCL[Yellow]}set-permissions${idsCL[Default]} - Set specific permissions preset for app folders" + echo -e " ${idsCL[Yellow]}siteinfo${idsCL[Default]} - View detailed nginx site info" echo -e " ${idsCL[Yellow]}status${idsCL[Default]} - Check Status of systems" echo -e " ${idsCL[Yellow]}update${idsCL[Default]} - Update nodemgmt" echo -e " ${idsCL[Yellow]}update-nodes${idsCL[Default]} - Update nodemgmt on all nodes"