safebox/installer-tool
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

public proxy lines were removed from deploy.sh

Browse Source
This commit is contained in:
Linux User
2023-06-06 10:04:43 +00:00
parent 68bb09d771
commit ee2bfa9555
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
deploy.sh
View File

@@ -14,7 +14,6 @@ if [ "$ORGANIZATION" == "" ]; then
ORGANIZATION=format ORGANIZATION=format
fi fi
PUBLIC_PROXY=$(toUpperCase $PUBLIC_PROXY)
SMARTHOST_PROXY=$(toUpperCase $SMARTHOST_PROXY) SMARTHOST_PROXY=$(toUpperCase $SMARTHOST_PROXY)
LOCAL_PROXY=$(toUpperCase $LOCAL_PROXY) LOCAL_PROXY=$(toUpperCase $LOCAL_PROXY)
VPN_PROXY=$(toUpperCase $VPN_PROXY) VPN_PROXY=$(toUpperCase $VPN_PROXY)
@@ -38,10 +37,6 @@ if [ "$DOCKER_REGISTRY_URL" = "" ]; then
DOCKER_REGISTRY_URL=registry.format.hu DOCKER_REGISTRY_URL=registry.format.hu
fi fi
if [[ "$PUBLIC_PROXY" == "YES" || "$PUBLIC_PROXY" == "TRUE" ]]; then
PROXY_TYPE=public-proxy;
fi
if [[ "$SMARTHOST_PROXY" == "YES" || "$SMARTHOST_PROXY" == "TRUE" ]]; then if [[ "$SMARTHOST_PROXY" == "YES" || "$SMARTHOST_PROXY" == "TRUE" ]]; then
PROXY_TYPE=$PROXY_TYPE" "smarthost-proxy; PROXY_TYPE=$PROXY_TYPE" "smarthost-proxy;
fi fi
@@ -91,15 +86,6 @@ install_core_dns() {
mkdir -p $DNS_DIR; mkdir -p $DNS_DIR;
cp -rv /tmp/$CORE_DNS/dns.conf $DNS_DIR/ ; cp -rv /tmp/$CORE_DNS/dns.conf $DNS_DIR/ ;
if [[ "$PUBLIC_PROXY" == "YES" || "$PUBLIC_PROXY" == "TRUE" ]]; then
EXISTS=$(grep -E ' publicloadbalancer| publicbackend-1| publicbackend-2' $DNS_DIR/hosts.local);
if [ -z "$EXISTS" ]; then
echo '172.18.100.2 publicloadbalancer
172.18.101.2 publicbackend-1
172.18.102.2 publicbackend-2' >> $DNS_DIR/hosts.local
fi;
fi;
if [[ "$SMARTHOST_PROXY" == "YES" || "$SMARTHOST_PROXY" == "TRUE" ]]; then if [[ "$SMARTHOST_PROXY" == "YES" || "$SMARTHOST_PROXY" == "TRUE" ]]; then
EXISTS=$(grep -E ' letsencrypt| smarthostloadbalancer| smarthostbackend-1| smarthostbackend-2' $DNS_DIR/hosts.local); EXISTS=$(grep -E ' letsencrypt| smarthostloadbalancer| smarthostbackend-1| smarthostbackend-2' $DNS_DIR/hosts.local);
if [ -z "$EXISTS" ]; then if [ -z "$EXISTS" ]; then