From a8482d89e4f5d1b621a0585bfcecdc5d077c3c8a Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 11 Nov 2023 16:03:35 -0600 Subject: [PATCH] Update sites.inc --- inc/sites.inc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/inc/sites.inc b/inc/sites.inc index 834831af..2e40f683 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -495,12 +495,11 @@ NEWPROXYSITE_CREATE(){ else # [ "${MAIN_SITE}" != "${SITENAME}" ] && mv ${NM_NGINXPATH}/sites-enabled/${SITENAME}.conf ${nginxconfig} - sed -i "/set \$forward_scheme/d" ${nginxconfig} - sed -i "/server {/a\\\tset \$forward_scheme ${PROXYSCHEME};" ${nginxconfig} -# sed -i "/set \$server/d" ${nginxconfig}; sed -ie "/set \$forward_scheme/a\tset \$server \"${PROXYHOST}\";" ${nginxconfig} -# sed -i "/set \$port/d" ${nginxconfig}; sed -ie "/set \$server/a\tset \$port ${PROXYPORT};" ${nginxconfig} -# sed -i "/server_name/d" ${nginxconfig}; sed -ie "/set \$port/a -# \tserver_name ${SERVERNAMES//,/ };" ${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 \$port/d" ${nginxconfig}; sed -i "/set \$server/a\\\tset \$port ${PROXYPORT};" ${nginxconfig} + sed -i "/server_name/d" ${nginxconfig}; sed -i "/set \$port/a +\\\tserver_name ${SERVERNAMES//,/ };" ${nginxconfig} if [ "${SECURE}" != "-" ]; then sed -i "s/#include conf.d\/include\/secure-access.conf/include conf.d\/include\/secure-access.conf/g" ${nginxconfig} @@ -525,7 +524,7 @@ NEWPROXYSITE_CREATE(){ - # sed -i "s/##include/#include/g" ${nginxconfig} + sed -i "s/##include/#include/g" ${nginxconfig} fi