From 71a30798428738825ed903b42ea7777c1bbfa12a Mon Sep 17 00:00:00 2001 From: Armin Co <armin.co@hs-bochum.de> Date: Sun, 25 Oct 2020 19:59:56 +0100 Subject: [PATCH] Fixing tools --- config.sh | 16 ++++++++-------- tools/start_containers.sh | 2 +- tools/stop_containers.sh | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config.sh b/config.sh index c7ea428..aff0f47 100755 --- a/config.sh +++ b/config.sh @@ -26,32 +26,32 @@ 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 # Jitsi JITSI_DIR=jitsi-auto-config JITSI_URL="$GIT_URL$JITSI_DIR".git -if ["$USE_JITSI" = "true"]; then +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 # noVNC - Screen sharing with VNC NOVNC_DIR=novnc NOVNC_URL="$GIT_URL$NOVNC_DIR".git -if ["$USE_NO_VNC" = "true"]; then +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 MUMBLE_DIR=build-mumble-web MUMBLE_URL=https://github.com/Johni0702/mumble-web.git -if ["$USE_MUMBLE" = "true"]; then +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 \ No newline at end of file +fi diff --git a/tools/start_containers.sh b/tools/start_containers.sh index 214073c..3b43da1 100755 --- a/tools/start_containers.sh +++ b/tools/start_containers.sh @@ -2,4 +2,4 @@ # start/restart all containers source config.sh -docker-compose $docker_compose_files up -d \ No newline at end of file +docker-compose $DOCKER_COMPOSE_FILES up -d \ No newline at end of file diff --git a/tools/stop_containers.sh b/tools/stop_containers.sh index e9dc112..b4672bf 100755 --- a/tools/stop_containers.sh +++ b/tools/stop_containers.sh @@ -1,4 +1,4 @@ #!/bin/bash source config.sh -docker-compose $docker_compose_files down \ No newline at end of file +docker-compose $DOCKER_COMPOSE_FILES down \ No newline at end of file -- GitLab