diff --git a/inc/sites.inc b/inc/sites.inc index 14d79428..28543e44 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -479,6 +479,7 @@ NEWPROXYSITE_CREATE(){ HSTS=${7} EXPLOITS=${8} SECURE=${9} + SSL=${10} if [[ ${SERVERNAMES} == *","* ]]; then NGINX_SERVERNAME=${SERVERNAMES} @@ -515,7 +516,7 @@ NEWPROXYSITE_CREATE(){ sed -i "s/live\/${SITENAME}\//live\/${MAIN_SITE}\//g" ${nginxconfig} elif [ "${oldservernames}" != "${NGINX_SERVERNAME}" ]; then - echo -e "\n${idsCL[LightCyan]}Updating SSL Cert for hostname changes, select to 'Update' when prompted:" + echo -e "\n${idsCL[LightCyan]}Updating SSL Cert for hostname changes, select 'E'xpand when prompted:" NEWCERT ${NGINX_SERVERNAME} echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n" else @@ -528,6 +529,11 @@ NEWPROXYSITE_CREATE(){ fi + if [ "${SSL}" == "Yes" ]; then + sed -i "s/#ssl_certificate/ssl_certificate/g" ${nginxconfig} + else + sed -i "s/ssl_certificate/#ssl_certificate/g" ${nginxconfig} + fi if [ "${SECURE}" == "Yes" ]; then sed -i "s/#include conf.d\/include\/secure-access.conf/include conf.d\/include\/secure-access.conf/g" ${nginxconfig} else @@ -550,6 +556,7 @@ NEWPROXYSITE_CREATE(){ fi sed -i "s/##include/#include/g" ${nginxconfig} + sed -i "s/##ssl_/#ssl_/g" ${nginxconfig} fi @@ -717,7 +724,7 @@ SITEINFO(){ echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A" ;; 1) [ "${type}" == "HTTP" ] && type='Proxy' || type='HTTP';; - 2) ;; + 2) [ "${ssl}" == "-" ] && ssl='Yes' || ssl='-';; 3) [ "${hsts}" == "-" ] && hsts='Yes' || hsts='-';; 4) [ "${wbskt}" == "-" ] && wbskt='Yes' || wbskt='-';; 5) [ "${explt}" == "-" ] && explt='Yes' || explt='-';; @@ -752,6 +759,9 @@ SITEINFO(){ echo -e "\033[K\n\033[K\n\033[K\n\033[K\n\033[K\n\033[K"; echo -e "\033[6A" + ;; + *) + ;; esac # [ "$edit" = "7" ] && echo -e "\033[5A"; echo -e "\033[K"; echo -e "\033[K"; echo -e "\033[K"; echo -e "\033[K"; echo -e "\033[K"; echo -e "\033[5A" @@ -766,7 +776,7 @@ SITEINFO(){ ;; *) echo -e "\n\n\n" - NEWPROXYSITE_CREATE ${site} ${servernames} ${server} ${port} ${scheme} ${wbskt} ${hsts} ${explt} ${lock} + NEWPROXYSITE_CREATE ${site} ${servernames} ${server} ${port} ${scheme} ${wbskt} ${hsts} ${explt} ${lock} ${ssl} break 3 ;;