diff --git a/setup.sh b/setup.sh index 79b5eb591afe913fac51fe507ee0c67b11066ad0..24e28a22f71486cb7c5280212f237e7e39141b28 100755 --- a/setup.sh +++ b/setup.sh @@ -15,10 +15,7 @@ function remove_all_configs() { # Clone repositories function clone_repositories() { git clone $LETSENCRYPT_URL - git clone $JITSI_URL - git clone $NOVNC_URL - git clone $MUMBLE_URL - wait + } function configure_letsencrypt() { @@ -66,11 +63,22 @@ echo "" remove_all_configs clone_repositories +if [ "$USE_JITSI" == "true" ]; then + git clone $JITSI_URL + ./"JITSI_DIR"/setup.sh +fi + configure_letsencrypt if [ "$USE_MUMBLE" == "true" ];then + git clone $MUMBLE_URL configure_mumble fi + +if [ "$USE_NOVNC" == "true" ];then + git clone $NOVNC_URL +fi + ./tools/stop_containers.sh ./tools/update_containers.sh \ No newline at end of file diff --git a/tools/update_containers.sh b/tools/update_containers.sh index c61051d8e036e5e0d78ff6a849af16f3a39d24c6..d8896087a6b79933e4776224ecac9b4d3c11e2cd 100755 --- a/tools/update_containers.sh +++ b/tools/update_containers.sh @@ -14,11 +14,11 @@ echo "Building images" echo "" # Build new images if neccessary -if [$USE_MUMBLE = "true"]; then +if [ "$USE_MUMBLE" == "true" ]; then docker-compose -f $mumble_compose_file build fi -if [$USE_NOVNC = "true"]; then +if [ "$USE_NOVNC" == "true" ]; then docker-compose -f $novnc_compose_file build fi