Skip to content
Snippets Groups Projects
Commit 4bd86f62 authored by Armin Co's avatar Armin Co
Browse files

Cleaning up

parent 8faf975c
Branches
No related tags found
No related merge requests found
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
# Variable that holds all docker-compose files. # Variable that holds all docker-compose files.
# This is the main compose file which includes letsencrypt # This is the main compose file which includes letsencrypt
# for your auto generated certificates. Don not remove! # 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 # noVNC - Screen sharing with VNC
# docker_compose_files+=" -f ./novnc/docker-compose.yml " # docker_compose_files+=" -f ./novnc/docker-compose.yml "
...@@ -18,10 +18,10 @@ docker_compose_files=" -f docker-compose.yml " ...@@ -18,10 +18,10 @@ docker_compose_files=" -f docker-compose.yml "
docker_compose_files+=" -f letsencrypt-webserver/docker-compose.yml " docker_compose_files+=" -f letsencrypt-webserver/docker-compose.yml "
# jitsi # jitsi
# docker_compose_files+=" -f ./jitsi-auto-config/jitsi/docker-compose.yml " docker_compose_files+=" -f ./jitsi-auto-config/jitsi/docker-compose.yml "
# mumble # 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 # "return" the string
......
#!/bin/bash #!/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
git_url="https://gitlab.cvh-server.de/aco/" git_url="https://gitlab.cvh-server.de/aco/"
...@@ -56,11 +63,8 @@ function clone_repositories() { ...@@ -56,11 +63,8 @@ function clone_repositories() {
git clone $novnc_url 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() { function configure_letsencrypt() {
echo "" echo ""
echo "Setting your letsencrypt domain settings." echo "Setting your letsencrypt domain settings."
...@@ -78,7 +82,7 @@ function configure_letsencrypt() { ...@@ -78,7 +82,7 @@ function configure_letsencrypt() {
# sed -i "s/- ONLY_SUBDOMAINS=true/- ONLY_SUBDOMAINS=false/" $le_dir # sed -i "s/- ONLY_SUBDOMAINS=true/- ONLY_SUBDOMAINS=false/" $le_dir
# start once to generate directories and certificates # 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 ""
echo "Done configuring LetsEncrypt and generating certificates." echo "Done configuring LetsEncrypt and generating certificates."
} }
...@@ -102,7 +106,7 @@ echo "" ...@@ -102,7 +106,7 @@ echo ""
echo "Starting configuration with cleaning up and pulling again." echo "Starting configuration with cleaning up and pulling again."
echo "" echo ""
./stop_containers.sh ./tools/stop_containers.sh
remove_all remove_all
clone_repositories clone_repositories
...@@ -113,8 +117,8 @@ configure_letsencrypt ...@@ -113,8 +117,8 @@ configure_letsencrypt
configure_mumble configure_mumble
./stop_containers.sh ./tools/stop_containers.sh
## pull and update all images ## pull and update all images
# #
./update_containers.sh ./tools/update_containers.sh
\ No newline at end of file \ No newline at end of file
DOMAIN=armin-co.de
JITSI_SUBDOMAIN=jitsi
SUBDOMAINS=$jitsi_subdomain.$domain,
\ No newline at end of file
#!/bin/bash
docker-compose logs -f
\ No newline at end of file
#!/bin/bash #!/bin/bash
# start/restart all containers # start/restart all containers
compose_files=$(./compose_files_conf.sh) # compose_files=$(./compose_files_conf.sh)
docker-compose $compose_files up -d #
\ No newline at end of file source compose_files_conf.sh
docker-compose $docker_compose_files up -d
\ No newline at end of file
#!/bin/bash #!/bin/bash
compose_files=$(./compose_files_conf.sh) # compose_files=$(./compose_files_conf.sh)
docker-compose $compose_files down
\ No newline at end of file source compose_files_conf.sh
docker-compose $docker_compose_files down
\ No newline at end of file
...@@ -2,12 +2,13 @@ ...@@ -2,12 +2,13 @@
# Update and restart containers # 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 "Pulling images"
echo "" echo ""
# pull updated images # pull updated images
docker-compose $compose_files pull docker-compose $docker_compose_files pull
echo "Building images" echo "Building images"
echo "" echo ""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment