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

Update sites.inc

Browse Source
This commit is contained in:
David Schroeder
2023-11-11 18:58:33 -06:00
parent 005d131a66
commit 67de40c753
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
inc/sites.inc
View File

@@ -481,11 +481,9 @@ NEWPROXYSITE_CREATE(){
SECURE=${9} SECURE=${9}
if [[ ${SERVERNAMES} == *","* ]]; then if [[ ${SERVERNAMES} == *","* ]]; then
echo $SERVERNAMES NGINX_SERVERNAME=${SERVERNAMES}
IFS=','; SERVERNAMES=(${SERVERNAMES}); unset IFS IFS=','; SERVERNAMES=(${SERVERNAMES}); unset IFS
MAIN_SITE=${SERVERNAMES[0]} MAIN_SITE=${SERVERNAMES[0]}
NGINX_SERVERNAME=${SERVERNAMES//[,]/ }
echo "$MAIN_SITE - $NGINX_SERVERNAME"
else else
MAIN_SITE=${SERVERNAMES} MAIN_SITE=${SERVERNAMES}
NGINX_SERVERNAME=${SERVERNAMES} NGINX_SERVERNAME=${SERVERNAMES}
@@ -498,7 +496,7 @@ NEWPROXYSITE_CREATE(){
[ "${MAIN_SITE}" != "${SITENAME}" ] && [ -f ${NM_NGINXPATH}/sites-enabled/${SITENAME}.conf ] && mv ${NM_NGINXPATH}/sites-enabled/${SITENAME}.conf ${nginxconfig} [ "${MAIN_SITE}" != "${SITENAME}" ] && [ -f ${NM_NGINXPATH}/sites-enabled/${SITENAME}.conf ] && mv ${NM_NGINXPATH}/sites-enabled/${SITENAME}.conf ${nginxconfig}
if [ ! -f ${nginxconfig} ]; then if [ ! -f ${nginxconfig} ]; then
cp ${NM_FOLDER}/templates/nginx.proxy.site ${nginxconfig} cp ${NM_FOLDER}/templates/nginx.proxy.site ${nginxconfig}
sed -i "s/<<SERVER_NAME>>/${SERVERNAMES//,/ }/g" ${nginxconfig} sed -i "s/<<SERVER_NAME>>/${NGINX_SERVERNAME//,/ }/g" ${nginxconfig}
sed -i "s/<<MAIN_SITE>>/${MAIN_SITE}/g" ${nginxconfig} sed -i "s/<<MAIN_SITE>>/${MAIN_SITE}/g" ${nginxconfig}
sed -i "s/<<PROXY_IP>>/${PROXYHOST}/g" ${nginxconfig} sed -i "s/<<PROXY_IP>>/${PROXYHOST}/g" ${nginxconfig}
sed -i "s/<<PROXY_PORT>>/${PROXYPORT}/g" ${nginxconfig} sed -i "s/<<PROXY_PORT>>/${PROXYPORT}/g" ${nginxconfig}
@@ -512,13 +510,13 @@ NEWPROXYSITE_CREATE(){
DEL-SSL ${SITENAME} >/dev/null 2>&1 DEL-SSL ${SITENAME} >/dev/null 2>&1
echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n" echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n"
echo -en "\n${idsCL[LightCyan]}Requesting new SSL Cert ... " echo -en "\n${idsCL[LightCyan]}Requesting new SSL Cert ... "
NEWCERT ${SERVERNAMES} >/dev/null 2>&1 NEWCERT ${NGINX_SERVERNAME} >/dev/null 2>&1
echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n" echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n"
sed -i "s/live\/${SITENAME}\//live\/${MAIN_SITE}\//g" ${nginxconfig} sed -i "s/live\/${SITENAME}\//live\/${MAIN_SITE}\//g" ${nginxconfig}
elif [ "${oldservernames}" != "${SERVERNAMES}" ]; 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 to 'Update' when prompted:"
NEWCERT ${SERVERNAMES} NEWCERT ${NGINX_SERVERNAME}
echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n" echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}\n"
else else
echo "WHAT ELSE" echo "WHAT ELSE"
@@ -526,7 +524,7 @@ NEWPROXYSITE_CREATE(){
sed -i "/set \$forward_scheme/d" ${nginxconfig}; sed -i "/server {/a\\\tset \$forward_scheme ${PROXYSCHEME};" ${nginxconfig} sed -i "/set \$forward_scheme/d" ${nginxconfig}; sed -i "/server {/a\\\tset \$forward_scheme ${PROXYSCHEME};" ${nginxconfig}
sed -i "/set \$server/d" ${nginxconfig}; sed -i "/set \$forward_scheme/a\\\tset \$server \"${PROXYHOST}\";" ${nginxconfig} sed -i "/set \$server/d" ${nginxconfig}; sed -i "/set \$forward_scheme/a\\\tset \$server \"${PROXYHOST}\";" ${nginxconfig}
sed -i "/set \$port/d" ${nginxconfig}; sed -i "/set \$server/a\\\tset \$port ${PROXYPORT};" ${nginxconfig} sed -i "/set \$port/d" ${nginxconfig}; sed -i "/set \$server/a\\\tset \$port ${PROXYPORT};" ${nginxconfig}
sed -i "/server_name/,+1 d" ${nginxconfig}; sed -i "/set \$port/a\\\n\tserver_name ${SERVERNAMES//,/ };" ${nginxconfig} sed -i "/server_name/,+1 d" ${nginxconfig}; sed -i "/set \$port/a\\\n\tserver_name ${NGINX_SERVERNAME//,/ };" ${nginxconfig}
fi fi