diff --git a/compose_files_conf.sh b/compose_files_conf.sh index 2b584d6197289544fd9b9bd4bb3d716de48cccc4..50358f020f1f68a000d007aeba7dbe91594d45d3 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 bf278868b6b29d3afe110bdf27dd48b6457ed261..b31eda0782f00d2092a9f1622927dfd3d0016616 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 181b2ba59932c3f5fa61e33413d630b2084df541..0000000000000000000000000000000000000000 --- 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 0c4dccfb279fdec50f4c5792522ff5b617696eb4..0000000000000000000000000000000000000000 --- 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 1b40ff70f9eac78f4913fcd191ed206f380b058b..6463d3a6125f4865825a5b86ab836248e09e9fcf 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 9e2f9ed87f808c66fd3635610fe9675d16044594..3d319f1cadce8b66d12c0ab1601a3c3678f59e7a 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 fa3e5d48cbb9be800d78a8ab2be43b4031556009..c50731e87d1cfa9f1ac48d98acef13d4024cbb67 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 ""