From 67407fbcca4b40460c3edef2a8b4769d5718cf0f Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 12 Nov 2023 13:48:40 -0600 Subject: [PATCH] Update sites.inc --- inc/sites.inc | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/inc/sites.inc b/inc/sites.inc index 369d88c5..0bd62c15 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -652,15 +652,19 @@ SITEINFO(){ else DIVIDER false darkGray ${dl} fi - if [ "$(grep include/proxy.conf ${sitefile})" != "" ]; then + if [ "$(grep include/proxy.conf ${sitefile})" != "" ] || [ "$(grep proxy_pass ${sitefile})" != "" ]; then type='Proxy' - server=$(grep 'set $server' ${sitefile}) - server=${server#*\"}; server=${server%\"*} - scheme=$(grep 'set $forward_scheme' ${sitefile}) - scheme=${scheme##* }; scheme=${scheme%;*} - port=$(grep 'set $port' ${sitefile}) - port=${port##* }; port=${port%;*} - proxyhost="${scheme}://${server}:${port}" + if [ "$(grep include/proxy.conf ${sitefile})" != "" ]; then + server=$(grep 'set $server' ${sitefile}) + server=${server#*\"}; server=${server%\"*} + scheme=$(grep 'set $forward_scheme' ${sitefile}) + scheme=${scheme##* }; scheme=${scheme%;*} + port=$(grep 'set $port' ${sitefile}) + port=${port##* }; port=${port%;*} + proxyhost="${scheme}://${server}:${port}" + else + proxyhost="custom Proxy_pass" + fi else type='HTTP' proxyhost=''