From b730ae6819756e6a114e03c8c58ee2cbb2bdc022 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 16 Dec 2023 15:36:17 -0600 Subject: [PATCH] Update sites.inc --- inc/sites.inc | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/inc/sites.inc b/inc/sites.inc index e7be06dc..b6307418 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -530,7 +530,7 @@ NEWPROXYSITE_CREATE(){ SITEINFO(){ # start=`date +%s` - dl=105 + dl=110 EDIT=0; SEARCH=0 while [ $# -gt 0 ]; do case "${1}" in @@ -760,7 +760,11 @@ EDITSITE(){ else SECURE='-' fi + + [ -f ${NM_NGINXPATH[${RUN_NODE_TYPE}]}/sites-enabled/${SITENAME}.conf ] && LIVE='Yes' || LIVE='' + else + LIVE='Yes' SITENAME=${MAIN_SITE} SITE_TYPE=${SITE_TYPE^} SERVERNAMES=${NEW_SITE} @@ -777,14 +781,15 @@ EDITSITE(){ editc=0 until [ "${editc^}" = "C" ]; do - echo -e "\033[K${idsCL[White]}0) Site Address(es): ${idsCL[Cyan]}${idsST[Bold]}${SERVERNAMES//,/, }${idsST[Reset]}" - echo -e "\033[K${idsCL[White]}1) Site Type: ${idsCL[Cyan]}${idsST[Bold]}${SITE_TYPE}${idsST[Reset]}" - echo -en "\033[K${idsCL[White]}2) SSL Secure: ${idsCL[Cyan]}${idsST[Bold]}${SSL}${idsST[Reset]}" + echo -e "\033[K${idsCL[White]}0) Site Enabled: ${idsCL[Cyan]}${idsST[Bold]}${LIVE}${idsST[Reset]}" + echo -e "\033[K${idsCL[White]}1) Site Address(es): ${idsCL[Cyan]}${idsST[Bold]}${SERVERNAMES//,/, }${idsST[Reset]}" + echo -e "\033[K${idsCL[White]}2) Site Type: ${idsCL[Cyan]}${idsST[Bold]}${SITE_TYPE}${idsST[Reset]}" + echo -en "\033[K${idsCL[White]}3) SSL Secure: ${idsCL[Cyan]}${idsST[Bold]}${SSL}${idsST[Reset]}" [ "${SUBJECTNAMES}" != "" ] && echo -e " ${idsCL[Cyan]}[SSL Names: ${idsCL[Yellow]}${SUBJECTNAMES}${idsCL[Cyan]}; expires ${idsCL[Yellow]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsCL[Cyan]}]" || echo - echo -e "\033[K${idsCL[White]}3) HSTS Enabled: ${idsCL[Cyan]}${idsST[Bold]}${HSTS}${idsST[Reset]}" - echo -e "\033[K${idsCL[White]}4) Web Sockets: ${idsCL[Cyan]}${idsST[Bold]}${WEBSOCKET}${idsST[Reset]}" - echo -e "\033[K${idsCL[White]}5) Exploits Block: ${idsCL[Cyan]}${idsST[Bold]}${EXPLOITS}${idsST[Reset]}" - echo -e "\033[K${idsCL[White]}6) Secured Access: ${idsCL[Cyan]}${idsST[Bold]}${SECURE}${idsST[Reset]}" + echo -e "\033[K${idsCL[White]}4) HSTS Enabled: ${idsCL[Cyan]}${idsST[Bold]}${HSTS}${idsST[Reset]}" + echo -e "\033[K${idsCL[White]}5) Web Sockets: ${idsCL[Cyan]}${idsST[Bold]}${WEBSOCKET}${idsST[Reset]}" + echo -e "\033[K${idsCL[White]}6) Exploits Block: ${idsCL[Cyan]}${idsST[Bold]}${EXPLOITS}${idsST[Reset]}" + echo -e "\033[K${idsCL[White]}7) Secured Access: ${idsCL[Cyan]}${idsST[Bold]}${SECURE}${idsST[Reset]}" if [ "${SITE_TYPE}" == "Proxy" ]; then echo -e "\033[K${idsCL[White]}7) Proxy Address: ${idsCL[Cyan]}${idsST[Bold]}${PROXYHOST}${idsST[Reset]}" echo -e "\033[K${idsCL[White]}8) Proxy Scheme: ${idsCL[Cyan]}${idsST[Bold]}${PROXYSCHEME}${idsST[Reset]}"