public proxy lines were removed from deploy.sh
This commit is contained in:
14
deploy.sh
14
deploy.sh
@@ -14,7 +14,6 @@ if [ "$ORGANIZATION" == "" ]; then
|
||||
ORGANIZATION=format
|
||||
fi
|
||||
|
||||
PUBLIC_PROXY=$(toUpperCase $PUBLIC_PROXY)
|
||||
SMARTHOST_PROXY=$(toUpperCase $SMARTHOST_PROXY)
|
||||
LOCAL_PROXY=$(toUpperCase $LOCAL_PROXY)
|
||||
VPN_PROXY=$(toUpperCase $VPN_PROXY)
|
||||
@@ -38,10 +37,6 @@ if [ "$DOCKER_REGISTRY_URL" = "" ]; then
|
||||
DOCKER_REGISTRY_URL=registry.format.hu
|
||||
fi
|
||||
|
||||
if [[ "$PUBLIC_PROXY" == "YES" || "$PUBLIC_PROXY" == "TRUE" ]]; then
|
||||
PROXY_TYPE=public-proxy;
|
||||
fi
|
||||
|
||||
if [[ "$SMARTHOST_PROXY" == "YES" || "$SMARTHOST_PROXY" == "TRUE" ]]; then
|
||||
PROXY_TYPE=$PROXY_TYPE" "smarthost-proxy;
|
||||
fi
|
||||
@@ -91,15 +86,6 @@ install_core_dns() {
|
||||
mkdir -p $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
|
||||
EXISTS=$(grep -E ' letsencrypt| smarthostloadbalancer| smarthostbackend-1| smarthostbackend-2' $DNS_DIR/hosts.local);
|
||||
if [ -z "$EXISTS" ]; then
|
||||
|
Reference in New Issue
Block a user