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

fix

Browse Source
This commit is contained in:
hael
2023-02-27 12:16:41 +00:00
parent 61f9a2eb59
commit 26ed901d15
1 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
deploy.sh
View File

@@ -36,7 +36,7 @@ if [[ "$PUBLIC_PROXY" == "YES" || "$PUBLIC_PROXY" == "TRUE" ]]; then
fi fi
if [[ "$SMARTHOST_PROXY" == "YES" || "$SMARTHOST_PROXY" == "TRUE" ]]; then if [[ "$SMARTHOST_PROXY" == "YES" || "$SMARTHOST_PROXY" == "TRUE" ]]; then
PROXY_TYPE=smarthost-proxy" "$PROXY_TYPE; PROXY_TYPE=$PROXY_TYPE" "smarthost-proxy;
fi fi
# INSTALL CORE DNS # INSTALL CORE DNS
@@ -48,6 +48,7 @@ if [ "$CORE_DNS" == "" ]; then
fi fi
install_core_dns() { install_core_dns() {
cp -rv /tmp/$CORE_DNS/*.json $SERVICE_DIR/ ; cp -rv /tmp/$CORE_DNS/*.json $SERVICE_DIR/ ;
DNS_VOLUMES=$(jq -r .containers[].VOLUMES[].SOURCE $SERVICE_DIR/$CORE_DNS.json |grep -v '\.') DNS_VOLUMES=$(jq -r .containers[].VOLUMES[].SOURCE $SERVICE_DIR/$CORE_DNS.json |grep -v '\.')
@@ -55,38 +56,35 @@ install_core_dns() {
mkdir -p $VOLUME; mkdir -p $VOLUME;
done done
DNS_VOLUMES=$(jq -r --arg DEST "/etc/dnsmasq" '.containers[0].VOLUMES[] | select(.DEST | startswith($DEST))' $SERVICE_DIR/$CORE_DNS.json) DNS_VOLUMES=$(jq -r --arg DEST "/etc/dnsmasq" '.containers[0].VOLUMES[] | select(.DEST | startswith($DEST))' $SERVICE_DIR/$CORE_DNS.json)
DNS_DIR=$(echo $DNS_VOLUMES | jq -r .SOURCE) DNS_DIR=$(echo $DNS_VOLUMES | jq -r .SOURCE)
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
EXISTS=$(grep -E ' letsencrypt| smarthostloadbalancer| smarthostbackend-1| smarthostbackend-2' $DNS_DIR/hosts.local);
if [ -z "$EXISTS" ]; then
echo '172.18.254.254 letsencrypt
172.18.103.2 smarthostloadbalancer
172.18.104.2 smarthostbackend-1
172.18.105.2 smarthostbackend-2' >> $DNS_DIR/hosts.local
fi;
fi
} }
git clone ssh://$GIT_REPO/$ORGANIZATION/$CORE_DNS.git /tmp/$CORE_DNS git clone ssh://$GIT_REPO/$ORGANIZATION/$CORE_DNS.git /tmp/$CORE_DNS
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
echo '
172.18.254.254 letsencrypt
172.18.103.2 smarthostloadbalancer
172.18.104.2 smarthostbackend-1
172.18.105.2 smarthostbackend-2
' >> $DNS_DIR/hosts.local
fi;
fi
# INSTALL PROXY SERVICES # INSTALL PROXY SERVICES
for i in $(echo $PROXY_TYPE); do for i in $(echo $PROXY_TYPE); do
@@ -113,9 +111,12 @@ for i in $(echo $PROXY_TYPE); do
PROXY_SERVICE_FILE=$(jq -r .$PROXY_SCHEDULER_NAME.PROXY_SERVICE_FILE /tmp/$i/proxy_config) PROXY_SERVICE_FILE=$(jq -r .$PROXY_SCHEDULER_NAME.PROXY_SERVICE_FILE /tmp/$i/proxy_config)
SERVICE_DIR=$(jq -r .containers[0].VOLUMES[].SOURCE /tmp/$i/$PROXY_SCHEDULER_FILE |grep $PROXY_SERVICE_FILE | sed s/$PROXY_SERVICE_FILE//g) SERVICE_DIR=$(jq -r .containers[0].VOLUMES[].SOURCE /tmp/$i/$PROXY_SCHEDULER_FILE |grep $PROXY_SERVICE_FILE | sed s/$PROXY_SERVICE_FILE//g)
PROXY_CONFIG_DIR=$(jq -r .$PROXY_SCHEDULER_NAME.PROXY_CONFIG_DIR /tmp/$i/proxy_config) PROXY_CONFIG_DIR=$(jq -r .$PROXY_SCHEDULER_NAME.PROXY_CONFIG_DIR /tmp/$i/proxy_config)
PROXY_VOLUME=$(jq -r --arg DEST "$PROXY_CONFIG_DIR" '.containers[0].VOLUMES[] | select(.DEST==$DEST)' /tmp/$i/$PROXY_SCHEDULER_FILE) if [ "$PROXY_CONFIG_DIR" == "null" ]; then
PROXY_DIR=$(echo $PROXY_VOLUME | jq -r .SOURCE) echo "$PROXY_SCHEDULER_NAME.PROXY_CONFIG_DIR doesn't exists in /tmp/$i/proxy_config";
fi;
PROXY_VOLUME=$(jq -r --arg DEST "$PROXY_CONFIG_DIR" '.containers[0].VOLUMES[] | select(.DEST==$DEST)' /tmp/$i/$PROXY_SCHEDULER_FILE)
PROXY_DIR=$(echo $PROXY_VOLUME | jq -r .SOURCE)
PROXY_DIR=$(dirname $PROXY_DIR | sed s/$i//g) PROXY_DIR=$(dirname $PROXY_DIR | sed s/$i//g)
DOMAIN_CONFIG_DIR=$(jq -r .$PROXY_SCHEDULER_NAME.DOMAIN_DIR /tmp/$i/proxy_config) DOMAIN_CONFIG_DIR=$(jq -r .$PROXY_SCHEDULER_NAME.DOMAIN_DIR /tmp/$i/proxy_config)