kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-10-10 10:48:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Nextcloud: switch Talk to host networking; update proxy routing and compose; centralize Talk secrets & spreed config; remove Greenlight block

Browse Source 
Conversation: https://chatgpt.com/share/68d74e25-c068-800f-ae20-d0e34ac8ee12
This commit is contained in:
Kevin Veen-Birkenbach
2025-09-27 05:03:48 +02:00
parent a044028e03
commit c362e160fc
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/web-app-nextcloud/config/main.yml
View File

@@ -51,7 +51,7 @@ docker:
version: "latest" version: "latest"
backup: backup:
no_stop_required: false no_stop_required: false
internal: false internal: true
network_mode: host network_mode: host
whiteboard: whiteboard:
name: "nextcloud-whiteboard" name: "nextcloud-whiteboard"

7
roles/web-app-nextcloud/templates/docker-compose.yml.j2
View File

@@ -12,11 +12,14 @@
- "{{ docker_compose.directories.volumes }}nginx.conf:/etc/nginx/nginx.conf:ro" - "{{ docker_compose.directories.volumes }}nginx.conf:/etc/nginx/nginx.conf:ro"
volumes_from: volumes_from:
- application - application
{% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %} {% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
networks: networks:
default: default:
ipv4_address: 192.168.102.67 ipv4_address: 192.168.102.67
{% if NEXTCLOUD_TALK_NETWORK_MODE == 'host' %}
extra_hosts:
- "host.docker.internal:host-gateway"
{% endif %}
application: application:
image: "{{ NEXTCLOUD_IMAGE }}:{{ NEXTCLOUD_VERSION }}" image: "{{ NEXTCLOUD_IMAGE }}:{{ NEXTCLOUD_VERSION }}"
@@ -42,7 +45,7 @@
image: "{{ NEXTCLOUD_TALK_IMAGE }}:{{ NEXTCLOUD_TALK_VERSION }}" image: "{{ NEXTCLOUD_TALK_IMAGE }}:{{ NEXTCLOUD_TALK_VERSION }}"
container_name: {{ NEXTCLOUD_TALK_CONTAINER }} container_name: {{ NEXTCLOUD_TALK_CONTAINER }}
init: true init: true
network_mode: {{ COTURN_NETWORK_MODE }} network_mode: {{ NEXTCLOUD_TALK_NETWORK_MODE }}
{% if NEXTCLOUD_TALK_NETWORK_MODE == 'bridge' %} {% if NEXTCLOUD_TALK_NETWORK_MODE == 'bridge' %}
ports: ports:
- {{ networks.internet.ip4 }}:{{ NEXTCLOUD_TALK_STUN_PORT }}:{{ NEXTCLOUD_TALK_INT_TURN_PORT }}/tcp - {{ networks.internet.ip4 }}:{{ NEXTCLOUD_TALK_STUN_PORT }}:{{ NEXTCLOUD_TALK_INT_TURN_PORT }}/tcp

4
roles/web-app-nextcloud/templates/nginx/docker.conf.j2
View File

@@ -192,7 +192,11 @@ http {
{% if NEXTCLOUD_TALK_SERVICE_ENABLED %} {% if NEXTCLOUD_TALK_SERVICE_ENABLED %}
location {{ NEXTCLOUD_TALK_LOCATION }} { location {{ NEXTCLOUD_TALK_LOCATION }} {
{% 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 }}/; proxy_pass http://talk:{{ NEXTCLOUD_TALK_PORT_INTERNAL }}/;
{% endif %}
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;