Update sites.inc

This commit is contained in:
2023-11-11 19:09:24 -06:00
parent 67de40c753
commit e124b79e3b

View File

@@ -479,6 +479,7 @@ NEWPROXYSITE_CREATE(){
HSTS=${7} HSTS=${7}
EXPLOITS=${8} EXPLOITS=${8}
SECURE=${9} SECURE=${9}
SSL=${10}
if [[ ${SERVERNAMES} == *","* ]]; then if [[ ${SERVERNAMES} == *","* ]]; then
NGINX_SERVERNAME=${SERVERNAMES} NGINX_SERVERNAME=${SERVERNAMES}
@@ -515,7 +516,7 @@ NEWPROXYSITE_CREATE(){
sed -i "s/live\/${SITENAME}\//live\/${MAIN_SITE}\//g" ${nginxconfig} sed -i "s/live\/${SITENAME}\//live\/${MAIN_SITE}\//g" ${nginxconfig}
elif [ "${oldservernames}" != "${NGINX_SERVERNAME}" ]; then 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} NEWCERT ${NGINX_SERVERNAME}
echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n" echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n"
else else
@@ -528,6 +529,11 @@ NEWPROXYSITE_CREATE(){
fi 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 if [ "${SECURE}" == "Yes" ]; then
sed -i "s/#include conf.d\/include\/secure-access.conf/include conf.d\/include\/secure-access.conf/g" ${nginxconfig} sed -i "s/#include conf.d\/include\/secure-access.conf/include conf.d\/include\/secure-access.conf/g" ${nginxconfig}
else else
@@ -550,6 +556,7 @@ NEWPROXYSITE_CREATE(){
fi fi
sed -i "s/##include/#include/g" ${nginxconfig} sed -i "s/##include/#include/g" ${nginxconfig}
sed -i "s/##ssl_/#ssl_/g" ${nginxconfig}
fi 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" 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';; 1) [ "${type}" == "HTTP" ] && type='Proxy' || type='HTTP';;
2) ;; 2) [ "${ssl}" == "-" ] && ssl='Yes' || ssl='-';;
3) [ "${hsts}" == "-" ] && hsts='Yes' || hsts='-';; 3) [ "${hsts}" == "-" ] && hsts='Yes' || hsts='-';;
4) [ "${wbskt}" == "-" ] && wbskt='Yes' || wbskt='-';; 4) [ "${wbskt}" == "-" ] && wbskt='Yes' || wbskt='-';;
5) [ "${explt}" == "-" ] && explt='Yes' || explt='-';; 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[K\n\033[K\n\033[K\n\033[K\n\033[K\n\033[K";
echo -e "\033[6A" echo -e "\033[6A"
;;
*)
;; ;;
esac 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" # [ "$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" 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 break 3
;; ;;