mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-10-09 18:28:10 +02:00
Nextcloud: switch Talk to host networking; update proxy routing and compose; centralize Talk secrets & spreed config; remove Greenlight block
Conversation: https://chatgpt.com/share/68d74e25-c068-800f-ae20-d0e34ac8ee12
This commit is contained in:
@@ -51,7 +51,7 @@ docker:
|
||||
version: "latest"
|
||||
backup:
|
||||
no_stop_required: false
|
||||
internal: false
|
||||
internal: true
|
||||
network_mode: host
|
||||
whiteboard:
|
||||
name: "nextcloud-whiteboard"
|
||||
|
@@ -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
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user