From c3325f7dd0ef63e326d9b24918f23540091af2cd Mon Sep 17 00:00:00 2001
From: Armin Co <armin.co@hs-bochum.de>
Date: Sun, 25 Oct 2020 21:05:13 +0100
Subject: [PATCH] Checking novnc config
---
README.md | 2 +-
config.sh | 2 +-
configure_once.sh => setup.sh | 8 +++++---
3 files changed, 7 insertions(+), 5 deletions(-)
rename configure_once.sh => setup.sh (92%)
diff --git a/README.md b/README.md
index 9c71787..5642834 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Collection of online tools for teaching at CVH.
### Prerequisites
- Docker-CE
- - Installation script ('install_docker.sh') is provided for current Ubuntu installations.
+ - Installation script (`install_docker.sh`) is provided for current Ubuntu installations.
For other distributions look for installation instructions at [Install Docker Engine](https://docs.docker.com/engine/install/)
- Docker Compose
- Will also be installed with the script for Docker-CE
diff --git a/config.sh b/config.sh
index d2bf5af..cf16276 100755
--- a/config.sh
+++ b/config.sh
@@ -11,7 +11,7 @@ SUB_DOMAINS=""
MAIL=test@armin-co.de
USE_JITSI="true"
-USE_NO_VNC="false"
+USE_NO_VNC="true"
USE_MUMBLE="false"
# Git
diff --git a/configure_once.sh b/setup.sh
similarity index 92%
rename from configure_once.sh
rename to setup.sh
index 5ca0085..79b5eb5 100755
--- a/configure_once.sh
+++ b/setup.sh
@@ -29,10 +29,10 @@ function configure_letsencrypt() {
# Adds your domain to docker-compose
sed -i "s/your-domain.com/$DOMAIN/" $le_compose
# Adds the list of subdomains to use to docker-compose
- sed -i "s/your_subdomains/$sub_domains/" $le_compose
+ sed -i "s/your_subdomains/$SUB_DOMAINS/" $le_compose
# Add E-Mail address that will be used to notify you
# about for example expiring certificates.
- sed -i "s/your_email/$mail/" $le_compose
+ sed -i "s/your_email/$MAIL/" $le_compose
# For using not only your subdomains uncomment the following line.
# sed -i "s/- ONLY_SUBDOMAINS=true/- ONLY_SUBDOMAINS=false/" $LETSENCRYPT_DIR
@@ -67,8 +67,10 @@ remove_all_configs
clone_repositories
configure_letsencrypt
-configure_mumble
+if [ "$USE_MUMBLE" == "true" ];then
+ configure_mumble
+fi
./tools/stop_containers.sh
./tools/update_containers.sh
\ No newline at end of file
--
GitLab