From 69d53c26e96fea4a2a41900aaf841fa2bfea0d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sat, 9 Feb 2019 12:21:53 +0100 Subject: [PATCH] Update server address. Remove published ports (nginx proxy does it). --- datacoop_hosts | 15 +-------------- roles/docker/defaults/main.yml | 3 +++ roles/docker/tasks/services/fider.yml | 2 -- roles/docker/tasks/services/gitea.yml | 1 - roles/docker/tasks/services/nextcloud.yml | 2 -- roles/docker/tasks/services/passit.yml | 2 -- roles/docker/tasks/services/thelounge.yml | 2 -- 7 files changed, 4 insertions(+), 23 deletions(-) diff --git a/datacoop_hosts b/datacoop_hosts index 09290208..5018f328 100644 --- a/datacoop_hosts +++ b/datacoop_hosts @@ -1,16 +1,3 @@ ###################################### ### All hosts -10.1.1.198 ansible_python_interpreter=/usr/bin/python3 -10.1.1.199 ansible_python_interpreter=/usr/bin/python3 - -###################################### -### Application servers -[servers] -10.1.1.198 -10.1.1.199 - -[datacoop1] -10.1.1.198 - -[datacoop2] -10.1.1.199 +85.235.225.231 ansible_port=19022 ansible_python_interpreter=/usr/bin/python3 diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 109fb63d..8bc38ef4 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -7,6 +7,9 @@ thelounge: nextcloud: domain: "cloud.{{ base_domain }}" +gitea: + domain: "git.{{ base_domain }}" + passit: domain: "passit.{{ base_domain }}" diff --git a/roles/docker/tasks/services/fider.yml b/roles/docker/tasks/services/fider.yml index 6fee7ec2..e8a5d598 100644 --- a/roles/docker/tasks/services/fider.yml +++ b/roles/docker/tasks/services/fider.yml @@ -27,8 +27,6 @@ docker_container: image: getfider/fider:stable restart_policy: always - published_ports: - - "9999:3000" networks: - name: fider - name: external_services diff --git a/roles/docker/tasks/services/gitea.yml b/roles/docker/tasks/services/gitea.yml index 4d08c26d..b92ac732 100644 --- a/roles/docker/tasks/services/gitea.yml +++ b/roles/docker/tasks/services/gitea.yml @@ -38,7 +38,6 @@ volumes: - gitea:/data published_ports: - - "3000:3000" - "222:22" env: VIRTUAL_HOST: "{{ gitea.domain }}" diff --git a/roles/docker/tasks/services/nextcloud.yml b/roles/docker/tasks/services/nextcloud.yml index 396ec65a..b9310f29 100644 --- a/roles/docker/tasks/services/nextcloud.yml +++ b/roles/docker/tasks/services/nextcloud.yml @@ -38,8 +38,6 @@ - name: external_services volumes: - nextcloud_app:/var/www/html - published_ports: - - "80" env: VIRTUAL_HOST: "{{ nextcloud.domain }}" LETSENCRYPT_HOST: "{{ nextcloud.domain }}" diff --git a/roles/docker/tasks/services/passit.yml b/roles/docker/tasks/services/passit.yml index 9ea5df64..9ee74bc4 100644 --- a/roles/docker/tasks/services/passit.yml +++ b/roles/docker/tasks/services/passit.yml @@ -28,8 +28,6 @@ image: passit/passit:stable command: bin/start.sh restart_policy: always - published_ports: - - "8000:8080" networks: - name: passit - name: external_services diff --git a/roles/docker/tasks/services/thelounge.yml b/roles/docker/tasks/services/thelounge.yml index 8b0de528..1e269fd4 100644 --- a/roles/docker/tasks/services/thelounge.yml +++ b/roles/docker/tasks/services/thelounge.yml @@ -14,8 +14,6 @@ name: thelounge image: thelounge/lounge:latest restart_policy: always - published_ports: - - "9000:9000" volumes: - thelounge:/home/lounge/data networks: