From 4bd86f622dd9536e6bdde908911d04571314cf46 Mon Sep 17 00:00:00 2001
From: Armin Co <armin.co@hs-bochum.de>
Date: Sat, 24 Oct 2020 20:36:21 +0200
Subject: [PATCH] Cleaning up

---
 compose_files_conf.sh      |  6 +++---
 configure_once.sh          | 24 ++++++++++++++----------
 personal_settings.sh       |  5 -----
 tools/show_docker_logs.sh  |  3 ---
 tools/start_containers.sh  |  6 ++++--
 tools/stop_containers.sh   |  6 ++++--
 tools/update_containers.sh |  5 +++--
 7 files changed, 28 insertions(+), 27 deletions(-)
 delete mode 100644 personal_settings.sh
 delete mode 100755 tools/show_docker_logs.sh

diff --git a/compose_files_conf.sh b/compose_files_conf.sh
index 2b584d6..50358f0 100755
--- a/compose_files_conf.sh
+++ b/compose_files_conf.sh
@@ -9,7 +9,7 @@
 # Variable that holds all docker-compose files.
 # This is the main compose file which includes letsencrypt
 # for your auto generated certificates. Don not remove!
-docker_compose_files=" -f docker-compose.yml "
+#docker_compose_files=" -f docker-compose.yml "
 
 # noVNC - Screen sharing with VNC
 # docker_compose_files+=" -f ./novnc/docker-compose.yml "
@@ -18,10 +18,10 @@ docker_compose_files=" -f docker-compose.yml "
 docker_compose_files+=" -f letsencrypt-webserver/docker-compose.yml "
 
 # jitsi
-# docker_compose_files+=" -f ./jitsi-auto-config/jitsi/docker-compose.yml "
+docker_compose_files+=" -f ./jitsi-auto-config/jitsi/docker-compose.yml "
 
 # mumble
-docker_compose_files+=" -f ./build-mumble-web/docker-compose.production.yml"
+#docker_compose_files+=" -f ./build-mumble-web/docker-compose.production.yml"
 
 
 # "return" the string
diff --git a/configure_once.sh b/configure_once.sh
index bf27886..b31eda0 100755
--- a/configure_once.sh
+++ b/configure_once.sh
@@ -1,7 +1,14 @@
 #!/bin/bash
 
-## Config
+
+## YOUR SETTINGS
+## Configure domains and letsencrypt
 #
+domain=armin-co.de
+sub_domains=mumble,mumble-web,jitsi
+mail=test@armin-co.de
+
+
 
 # git
 git_url="https://gitlab.cvh-server.de/aco/"
@@ -56,11 +63,8 @@ function clone_repositories() {
     git clone $novnc_url
 }
 
-## Configure domains and letsencrypt
-#
-domain=armin-co.de
-sub_domains=mumble,mumble-web,jitsi
-mail=your-webmaster-mail@somwhere.org
+
+
 function configure_letsencrypt() {
     echo ""
     echo "Setting your letsencrypt domain settings."
@@ -78,7 +82,7 @@ function configure_letsencrypt() {
     # sed -i "s/- ONLY_SUBDOMAINS=true/- ONLY_SUBDOMAINS=false/" $le_dir
 
     # start once to generate directories and certificates
-    docker-compose -f docker-compose.yml -f $le_compose up -d && docker logs reverse-proxy && docker-compose -f $le_compose down
+    docker-compose -f $le_compose up -d && docker logs reverse-proxy && docker-compose -f $le_compose down
     echo ""
     echo "Done configuring LetsEncrypt and generating certificates."
 }
@@ -102,7 +106,7 @@ echo ""
 echo "Starting configuration with cleaning up and pulling again."
 echo ""
 
-./stop_containers.sh
+./tools/stop_containers.sh
 remove_all
 clone_repositories
 
@@ -113,8 +117,8 @@ configure_letsencrypt
 configure_mumble
 
 
-./stop_containers.sh
+./tools/stop_containers.sh
 
 ## pull and update all images
 #
-./update_containers.sh
\ No newline at end of file
+./tools/update_containers.sh
\ No newline at end of file
diff --git a/personal_settings.sh b/personal_settings.sh
deleted file mode 100644
index 181b2ba..0000000
--- a/personal_settings.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-DOMAIN=armin-co.de
-JITSI_SUBDOMAIN=jitsi
-
-
-SUBDOMAINS=$jitsi_subdomain.$domain,
\ No newline at end of file
diff --git a/tools/show_docker_logs.sh b/tools/show_docker_logs.sh
deleted file mode 100755
index 0c4dccf..0000000
--- a/tools/show_docker_logs.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker-compose logs -f
\ No newline at end of file
diff --git a/tools/start_containers.sh b/tools/start_containers.sh
index 1b40ff7..6463d3a 100755
--- a/tools/start_containers.sh
+++ b/tools/start_containers.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
 # start/restart all containers
-compose_files=$(./compose_files_conf.sh)
-docker-compose $compose_files up -d
\ No newline at end of file
+# compose_files=$(./compose_files_conf.sh)
+#
+source compose_files_conf.sh
+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 9e2f9ed..3d319f1 100755
--- a/tools/stop_containers.sh
+++ b/tools/stop_containers.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
 
-compose_files=$(./compose_files_conf.sh)
-docker-compose $compose_files down
\ No newline at end of file
+# compose_files=$(./compose_files_conf.sh)
+
+source compose_files_conf.sh
+docker-compose $docker_compose_files down
\ No newline at end of file
diff --git a/tools/update_containers.sh b/tools/update_containers.sh
index fa3e5d4..c50731e 100755
--- a/tools/update_containers.sh
+++ b/tools/update_containers.sh
@@ -2,12 +2,13 @@
 
 # Update and restart containers 
 
-compose_files=$(./compose_files_conf.sh)
+source compose_files_conf.sh
+# compose_files=$(./compose_files_conf.sh)
 
 echo "Pulling images"
 echo ""
 # pull updated images 
-docker-compose $compose_files pull
+docker-compose $docker_compose_files pull
 
 echo "Building images"
 echo ""
-- 
GitLab