From 07832773bd57acf2215f3e9fbeb8fef3e08d6df4 Mon Sep 17 00:00:00 2001 From: Armin Co <armin.co@hs-bochum.de> Date: Sun, 25 Oct 2020 22:12:05 +0100 Subject: [PATCH] Config --- config.sh | 5 +++-- setup.sh | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/config.sh b/config.sh index 0e57dcd..f4dced7 100755 --- a/config.sh +++ b/config.sh @@ -48,8 +48,9 @@ DOCKER_COMPOSE_FILES+="$novnc_compose_file" fi # Mumble -MUMBLE_DIR=build-mumble-web -MUMBLE_URL=https://github.com/Johni0702/mumble-web.git +MUMBLE_WEB_DIR=build-mumble-web +#MUMBLE_URL=https://github.com/Johni0702/mumble-web.git +MUMBLE_WEB_URL=https://gitlab.cvh-server.de/aco/build-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" diff --git a/setup.sh b/setup.sh index 7448279..c561fcc 100755 --- a/setup.sh +++ b/setup.sh @@ -42,12 +42,12 @@ function configure_letsencrypt() { ## Configure Murmur (mumble server) and mumble-web # -function configure_mumble() { - cd $MUMBLE_DIR +function configure_mumble_web(){ + cd $MUMBLE_WEB_DIR git clone https://github.com/Johni0702/mumble-web.git cd .. mkdir murmur - cp $MUMBLE_DIR/murmur/mumble-server.ini murmur/mumble-server.ini + cp $MUMBLE_WEB_DIR/murmur/mumble-server.ini murmur/mumble-server.ini touch murmur/mumble-server.log } @@ -70,9 +70,9 @@ if [ "$USE_JITSI" == "true" ]; then fi if [ "$USE_MUMBLE" == "true" ];then - git clone $MUMBLE_URL + git clone $MUMBLE_WEB_URL wait - configure_mumble + configure_mumble_web fi if [ "$USE_NOVNC" == "true" ];then -- GitLab