diff --git a/roles/web-app-nextcloud/config/main.yml b/roles/web-app-nextcloud/config/main.yml index bbbc0d58..df7a7a96 100644 --- a/roles/web-app-nextcloud/config/main.yml +++ b/roles/web-app-nextcloud/config/main.yml @@ -51,7 +51,7 @@ docker: version: "latest" backup: no_stop_required: false - internal: false + internal: true network_mode: host whiteboard: name: "nextcloud-whiteboard" diff --git a/roles/web-app-nextcloud/templates/docker-compose.yml.j2 b/roles/web-app-nextcloud/templates/docker-compose.yml.j2 index 2ddef516..417c0e1e 100644 --- a/roles/web-app-nextcloud/templates/docker-compose.yml.j2 +++ b/roles/web-app-nextcloud/templates/docker-compose.yml.j2 @@ -12,11 +12,14 @@ - "{{ docker_compose.directories.volumes }}nginx.conf:/etc/nginx/nginx.conf:ro" volumes_from: - application - -{% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %} +{% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %} networks: default: ipv4_address: 192.168.102.67 +{% if NEXTCLOUD_TALK_NETWORK_MODE == 'host' %} + extra_hosts: + - "host.docker.internal:host-gateway" +{% endif %} application: image: "{{ NEXTCLOUD_IMAGE }}:{{ NEXTCLOUD_VERSION }}" @@ -42,7 +45,7 @@ image: "{{ NEXTCLOUD_TALK_IMAGE }}:{{ NEXTCLOUD_TALK_VERSION }}" container_name: {{ NEXTCLOUD_TALK_CONTAINER }} init: true - network_mode: {{ COTURN_NETWORK_MODE }} + network_mode: {{ NEXTCLOUD_TALK_NETWORK_MODE }} {% if NEXTCLOUD_TALK_NETWORK_MODE == 'bridge' %} ports: - {{ networks.internet.ip4 }}:{{ NEXTCLOUD_TALK_STUN_PORT }}:{{ NEXTCLOUD_TALK_INT_TURN_PORT }}/tcp diff --git a/roles/web-app-nextcloud/templates/nginx/docker.conf.j2 b/roles/web-app-nextcloud/templates/nginx/docker.conf.j2 index bcbdda4e..c98f6fd7 100644 --- a/roles/web-app-nextcloud/templates/nginx/docker.conf.j2 +++ b/roles/web-app-nextcloud/templates/nginx/docker.conf.j2 @@ -192,7 +192,11 @@ http { {% if NEXTCLOUD_TALK_SERVICE_ENABLED %} location {{ NEXTCLOUD_TALK_LOCATION }} { - proxy_pass http://talk:{{ NEXTCLOUD_TALK_PORT_INTERNAL }}/; +{% if NEXTCLOUD_TALK_NETWORK_MODE == 'host' %} + proxy_pass http://host.docker.internal:{{ NEXTCLOUD_TALK_PORT_INTERNAL }}/; +{% else %} + proxy_pass http://talk:{{ NEXTCLOUD_TALK_PORT_INTERNAL }}/; +{% endif %} proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header Upgrade $http_upgrade;