diff --git a/deploy.sh b/deploy.sh index 518f34d..f8e403e 100755 --- a/deploy.sh +++ b/deploy.sh @@ -24,6 +24,9 @@ OPENVPN=$(toUpperCase $OPENVPN) LETSENCRYPT_MAIL=$LETSENCRYPT_MAIL USER_CONFIG_PATH=$USER_CONFIG_PATH DOMAIN=$DOMAIN; +DISCOVERY=$DISCOVERY; +DISCOVERY_DIR=$DISCOVERY_DIR; +DISCOVERY_CONFIG_FILE=$DISCOVERY_CONFIG_FILE; if [ "$USER_CONFIG_PATH" = "" ]; then USER_CONFIG_PATH=/etc/user/config/user.json @@ -62,6 +65,9 @@ fi if [ "$LOCAL_BACKEND_REPO" == "" ]; then LOCAL_BACKEND_REPO="local-backend"; fi +if [ "$SERVICE_EXEC_REPO" == "" ]; then + SERVICE_EXEC_REPO="service-exec-new"; +fi install_local_backend() { @@ -140,6 +146,14 @@ install_additionals() { fi + if [[ "$DISCOVERY" == "YES" ]]; then + cp -av /tmp/$SERVICE_EXEC_REPO/service-discovery.sh $DISCOVERY_DIR + cp -av /tmp/$SERVICE_EXEC_REPO/service-files.sh $DISCOVERY_DIR + if [ ! -f $DISCOVERY_CONFIG_FILE ]; then + cp -av /tmp/$SERVICE_EXEC_REPO/discovery.conf $DISCOVERY_CONFIG_FILE + fi; + fi + } git clone ssh://$GIT_REPO/$ORGANIZATION/$CORE_DNS.git /tmp/$CORE_DNS @@ -157,6 +171,9 @@ if [[ "$CRON" == "YES" || "$CRON" == "TRUE" ]]; then git clone ssh://$GIT_REPO/$ORGANIZATION/$CRON_REPO.git /tmp/$CRON_REPO fi +if [[ "$DISCOVERY" == "YES" ]]; then + git clone ssh://$GIT_REPO/$ORGANIZATION/$SERVICE_EXEC_REPO.git /tmp/$SERVICE_EXEC_REPO +fi; # INSTALL PROXY SERVICES