safebox/proxy-scheduler
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed LOCAL_IP to LOCAL_NAME in nginx config create

Browse Source
This commit is contained in:
Gyorgy Berenyi
2023-01-26 12:28:23 +00:00
parent ed6d539e95
commit 29e637e54f
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/config_haproxy_create.sh
View File

@@ -76,7 +76,7 @@ for i in `ls $DOMAIN_DIR|cut -d / -f2` ; do
then
echo "backend $(jq -r .DOMAIN $i)_http";
echo " mode http";
echo " server $(jq -r .DOMAIN $i) $(jq -r .LOCAL_IP $i):$(jq -r .HTTP_PORT $i) send-proxy";
echo " server $(jq -r .DOMAIN $i) $(jq -r .LOCAL_NAME $i):$(jq -r .HTTP_PORT $i) send-proxy";
fi
done
@@ -123,7 +123,7 @@ for i in `ls $DOMAIN_DIR|cut -d / -f2` ; do
echo "backend $(jq -r .DOMAIN $i)_https";
echo " option ssl-hello-chk";
echo " mode tcp";
echo " server $(jq -r .DOMAIN $i) $(jq -r .LOCAL_IP $i):$(jq -r .HTTPS_PORT $i) check send-proxy";
echo " server $(jq -r .DOMAIN $i) $(jq -r .LOCAL_NAME $i):$(jq -r .HTTPS_PORT $i) check send-proxy";
fi
done

16
scripts/nginx_config_create.sh
View File

@@ -15,7 +15,7 @@ DOMAIN_SOURCE=/domains/$DOMAIN
DOMAIN_NAME=$(jq -r .DOMAIN $DOMAIN_SOURCE)
HTTP_PORT=$(jq -r .HTTP_PORT $DOMAIN_SOURCE)
HTTPS_PORT=$(jq -r .HTTPS_PORT $DOMAIN_SOURCE)
LOCAL_IP=$(jq -r .LOCAL_IP $DOMAIN_SOURCE)
LOCAL_NAME=$(jq -r .LOCAL_NAME $DOMAIN_SOURCE)
ALIASES_HTTP=$(jq -r '.ALIASES_HTTP | select(.!="null") | join(" ")' $DOMAIN_SOURCE)
ALIASES_HTTPS=$(jq -r '.ALIASES_HTTPS | select(.!="null") | join(" ")' $DOMAIN_SOURCE)
REDIRECT_HTTP=$(jq -r .REDIRECT_HTTP $DOMAIN_SOURCE)
@@ -98,7 +98,7 @@ if [[ "$HTTP_PORT" != "" && "$HTTP_PORT" != "80" ]]; then
fi
if [[ "$HTTP_PORT" != "" ]]; then
echo " proxy_pass http://$LOCAL_IP:$HTTP_PORT;"
echo " proxy_pass http://$LOCAL_NAME:$HTTP_PORT;"
fi
echo " proxy_set_header Host "'$http_host'";
@@ -201,7 +201,7 @@ location = /$ERROR_PAGE {
done
echo " deny all;"
fi
echo " proxy_pass http://$LOCAL_IP:$HTTPS_PORT;"
echo " proxy_pass http://$LOCAL_NAME:$HTTPS_PORT;"
echo " proxy_set_header Host "'$http_host'";
proxy_set_header X-Real-IP "'$remote_addr'";
@@ -232,12 +232,12 @@ echo " proxy_pass http://$LOCAL_IP:$HTTPS_PORT;"
ALP=$(jq -r .ALTERNATE_LOCATION_PATH[$i] $DOMAIN_SOURCE)
ALP_LOCAL_PATH=$(echo $ALP | jq -rc .LOCAL_PATH);
ALP_LOCAL_IP=$(echo $ALP | jq -rc .LOCAL_IP);
ALP_LOCAL_NAME=$(echo $ALP | jq -rc .LOCAL_NAME);
ALP_LOCAL_PORT=$(echo $ALP | jq -rc .LOCAL_PORT);
ALP_LOCAL_ALLOWED_NETWORK=$(echo $ALP | jq -rc '.LOCAL_ALLOWED_NETWORK | select(.!="null") | join(" ")');
if [[ "$ALP_LOCAL_IP" = "" ]]; then
ALP_LOCAL_IP=$LOCAL_IP
if [[ "$ALP_LOCAL_NAME" = "" ]]; then
ALP_LOCAL_NAME=$LOCAL_NAME
fi;
if [[ "$ALP_LOCAL_PORT" = "" ]]; then
@@ -255,9 +255,9 @@ echo " proxy_pass http://$LOCAL_IP:$HTTPS_PORT;"
fi
if [[ "$ALP_LOCAL_PORT" != "" ]]; then
echo " proxy_pass http://$ALP_LOCAL_IP:$ALP_LOCAL_PORT;"
echo " proxy_pass http://$ALP_LOCAL_NAME:$ALP_LOCAL_PORT;"
else
echo " proxy_pass http://$ALP_LOCAL_IP:80;"
echo " proxy_pass http://$ALP_LOCAL_NAME:80;"
fi
echo " proxy_set_header Host "'$http_host'";

4
scripts/scheduler.sh
View File

@@ -35,7 +35,7 @@ do
elif [[ "${parent}" == "${DOMAIN_DIR}" && "${op}" == "CLOSE_WRITE,CLOSE" || "${op}" == "MOVED_TO" ]]; then
DOMAIN=$(echo $file);
DOMAIN=$(echo $file | jq .DOMAIN);
if [[ "${PROXY_TYPE}" == "haproxy" ]]; then
echo "haproxy config created, changed";
@@ -55,7 +55,7 @@ elif [[ "${parent}" == "${PROXY_CONFIG_DIR}" && "${op}" == "CLOSE_WRITE,CLOSE" ]
fi;
elif [[ "${parent}" == "${DOMAIN_DIR}" && "${op}" == "DELETE" ]] ; then
DOMAIN=$(echo $file);
DOMAIN=$(echo $file | jq .DOMAIN);
echo "domain deleted";
if [[ "${PROXY_TYPE}" == "haproxy" ]]; then