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

update

Browse Source
This commit is contained in:
David Schroeder
2023-05-24 22:40:55 -05:00
parent 7fdc4a4d4b
commit 1c441824ba
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -36,6 +36,8 @@ WMDOCKER=uptime-kuma
PWDOCKER=uptime-kuma PWDOCKER=uptime-kuma
#LBDOCKER=nginx-proxy_manager #LBDOCKER=nginx-proxy_manager
LB_NGINX_SITES='/opt/lb-data/nginx/sites-enabled'
noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck ' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck '
CERT_DAEMON='/snap/bin/certbot' CERT_DAEMON='/snap/bin/certbot'
FOLDER=/opt/idssys/nodemgmt FOLDER=/opt/idssys/nodemgmt

32
inc/sites.inc
View File

@@ -443,8 +443,8 @@ VIEWSITEINFO(){
cw_spc2=10 cw_spc2=10
cw_spc3=7 cw_spc3=7
cw_spc4=7 cw_spc4=7
cw_spc5=10 cw_spc5=7
# cw_spc6=15 cw_spc6=7
echo -e "${idsCL[LightGreen]}Site Information ${idsCL[Default]}" echo -e "${idsCL[LightGreen]}Site Information ${idsCL[Default]}"
DIVIDER false yellow 80 DIVIDER false yellow 80
@@ -453,14 +453,30 @@ VIEWSITEINFO(){
msg3="SSL"; c=0; spc3=''; spct=$((${cw_spc3}-${#msg3})); until [ $c = ${spct} ]; do spc3="${spc3} "; 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 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 msg5="WBSKT"; c=0; spc5=''; spct=$((${cw_spc5}-${#msg5})); until [ $c = ${spct} ]; do spc5="${spc5} "; c=`expr $c + 1`; done
msg6="Proxy Host"; # c=0; spc6=''; spct=$((${cw_spc6}-${#msg6})); until [ $c = ${spct} ]; do spc6="${spc6} "; 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
echo -e "${msg1}${spc1}${msg2}${spc2}${msg3}${spc3}${msg4}${spc4}${msg5}${spc5}${msg6}${spc7}" msg7="Proxy Host";
echo -e "${msg1}${spc1}${msg2}${spc2}${msg3}${spc3}${msg4}${spc4}${msg5}${spc5}${msg6}${spc6}${msg7}"
DIVIDER false yellow 80 DIVIDER false yellow 80
sites=$(find /opt/lb-data/nginx/sites-enabled/*) sites=$(find ${LB_NGINX_SITES}/*)
for site in ${sites[@]}; do for sitefile in ${sites[@]}; do
site=${site##*/}; site=${site/.conf/} site=${sitefile##*/}; site=${site/.conf/}
echo "${site}"
[ grep -q "include/proxy.conf" "${sitefile}" ] && type='Proxy' || type='HTTP'
[ grep -q "ssl_certificate" "${sitefile}" ] && ssl='Yes' || ssl=''
[ grep -q "include/hsts-support.conf" "${sitefile}" ] && hsts='Yes' || hsts=''
[ grep -q "include/websocket-support.conf" "${sitefile}" ] && wbskt='Yes' || wbskt=''
[ grep -q "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}"
done done
} }