diff --git a/config.sh b/config.sh index aff0f47d2f9dad8c76138436e7ef0b3d0a16ad8e..5eaa1b27815a22ad9c290ca5d34cc9fd1e37a5e2 100755 --- a/config.sh +++ b/config.sh @@ -22,11 +22,11 @@ GIT_URL="https://gitlab.cvh-server.de/aco/" # This is the main compose file. Don not remove! # Required for unified a unified path layout. base_compose_file=" -f docker-compose.base.yml " -DOCKER_COMPOSE_FILES=$base_compose_file +DOCKER_COMPOSE_FILES="$base_compose_file" # Letsencrypt letsencrypt_compose_file=" -f letsencrypt-webserver/docker-compose.yml " -$DOCKER_COMPOSE_FILES+=$letsencrypt_compose_file +$DOCKER_COMPOSE_FILES+="$letsencrypt_compose_file" LETSENCRYPT_DIR=letsencrypt-webserver LETSENCRYPT_URL="$GIT_URL$LETSENCRYPT_DIR".git @@ -35,7 +35,7 @@ JITSI_DIR=jitsi-auto-config JITSI_URL="$GIT_URL$JITSI_DIR".git if [ "$USE_JITSI" == "true" ]; then jitsi_compose_file=" -f jitsi/docker-compose.yml " -$DOCKER_COMPOSE_FILES+=$jitsi_compose_file +$DOCKER_COMPOSE_FILES+="$jitsi_compose_file" SUB_DOMAINS+="jitsi," fi @@ -44,7 +44,7 @@ NOVNC_DIR=novnc NOVNC_URL="$GIT_URL$NOVNC_DIR".git if [ "$USE_NO_VNC" == "true" ]; then novnc_compose_file=" -f ./novnc/docker-compose.yml " -$DOCKER_COMPOSE_FILES+=$novnc_compose_file +$DOCKER_COMPOSE_FILES+="$novnc_compose_file" fi # Mumble @@ -52,6 +52,6 @@ MUMBLE_DIR=build-mumble-web MUMBLE_URL=https://github.com/Johni0702/mumble-web.git if [ "$USE_MUMBLE" == "true" ]; then mumble_compose_file=" -f ./build-mumble-web/docker-compose.production.yml" -$DOCKER_COMPOSE_FILES+=$mumble_compose_file +$DOCKER_COMPOSE_FILES+="$mumble_compose_file" SUB_DOMAINS+="mumble-web" fi