From 4b56ab3d186f0cced98e8b1c2f4a08da68a94b78 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Mon, 22 Sep 2025 16:20:32 +0200
Subject: [PATCH] Normalized Nextcloud port variable mapping

---
 roles/web-app-nextcloud/templates/docker-compose.yml.j2 | 4 ++--
 roles/web-app-nextcloud/templates/nginx/docker.conf.j2  | 4 ++--
 roles/web-app-nextcloud/vars/main.yml                   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/roles/web-app-nextcloud/templates/docker-compose.yml.j2 b/roles/web-app-nextcloud/templates/docker-compose.yml.j2
index 906f416b..1464a50d 100644
--- a/roles/web-app-nextcloud/templates/docker-compose.yml.j2
+++ b/roles/web-app-nextcloud/templates/docker-compose.yml.j2
@@ -36,7 +36,7 @@
 
 {% if NEXTCLOUD_TALK_ENABLED %}
   talk:
-{% set container_port = NEXTCLOUD_TALK_INTERNAL_PORT %}
+{% set container_port = NEXTCLOUD_TALK_PORT_INTERNAL %}
 {% include 'roles/docker-container/templates/base.yml.j2' %}
 {% include 'roles/docker-container/templates/healthcheck/tcp.yml.j2' %}
     image: "{{ NEXTCLOUD_TALK_IMAGE }}:{{ NEXTCLOUD_TALK_VERSION }}"
@@ -54,7 +54,7 @@
 
 {% if NEXTCLOUD_WHITEBOARD_ENABLED %}
   whiteboard:
-{% set container_port = NEXTCLOUD_WHITEBOARD_INTERNAL_PORT %}
+{% set container_port = NEXTCLOUD_WHITEBOARD_PORT_INTERNAL %}
 {% include 'roles/docker-container/templates/base.yml.j2' %}
 {% include 'roles/docker-container/templates/healthcheck/nc.yml.j2' %}
     image: "{{ NEXTCLOUD_WHITEBOARD_IMAGE }}:{{ NEXTCLOUD_WHITEBOARD_VERSION }}"
diff --git a/roles/web-app-nextcloud/templates/nginx/docker.conf.j2 b/roles/web-app-nextcloud/templates/nginx/docker.conf.j2
index cea2fa77..1677fb61 100644
--- a/roles/web-app-nextcloud/templates/nginx/docker.conf.j2
+++ b/roles/web-app-nextcloud/templates/nginx/docker.conf.j2
@@ -181,7 +181,7 @@ http {
         }
 
         location {{ NEXTCLOUD_WHITEBOARD_LOCATION }} {
-            proxy_pass         http://whiteboard:{{ NEXTCLOUD_WHITEBOARD_INTERNAL_PORT }}/;
+            proxy_pass         http://whiteboard:{{ NEXTCLOUD_WHITEBOARD_PORT_INTERNAL }}/;
             proxy_http_version 1.1;
             proxy_set_header   Host              $host;
             proxy_set_header   X-Forwarded-For   $proxy_add_x_forwarded_for;
@@ -191,7 +191,7 @@ http {
         }
 
         location {{ NEXTCLOUD_TALK_LOCATION }} {
-            proxy_pass         http://talk:{{ NEXTCLOUD_TALK_INTERNAL_PORT }}/;
+            proxy_pass         http://talk:{{ NEXTCLOUD_TALK_PORT_INTERNAL }}/;
             proxy_http_version 1.1;
             proxy_set_header   Host              $host;
             proxy_set_header   Upgrade           $http_upgrade;
diff --git a/roles/web-app-nextcloud/vars/main.yml b/roles/web-app-nextcloud/vars/main.yml
index f2352328..88374a35 100644
--- a/roles/web-app-nextcloud/vars/main.yml
+++ b/roles/web-app-nextcloud/vars/main.yml
@@ -66,7 +66,7 @@ NEXTCLOUD_TALK_STUN_PORT:           "{{ ports.public.stun[application_id] }}"
 NEXTCLOUD_TALK_DOMAIN:              "{{ NEXTCLOUD_DOMAIN }}"
 NEXTCLOUD_TALK_LOCATION:            "/standalone-signaling/"
 NEXTCLOUD_TALK_URL:                 "{{ [ NEXTCLOUD_URL, NEXTCLOUD_TALK_LOCATION ] | url_join }}"
-NEXTCLOUD_TALK_INTERNAL_PORT:       "8081"
+NEXTCLOUD_TALK_PORT_INTERNAL:       "8081"
 NEXTCLOUD_TALK_INT_TURN_PORT:       "3478"
 
 ### Whiteboard
@@ -74,7 +74,7 @@ NEXTCLOUD_WHITEBOARD_CONTAINER:     "{{ applications | get_app_conf(application_
 NEXTCLOUD_WHITEBOARD_IMAGE:         "{{ applications | get_app_conf(application_id, 'docker.services.whiteboard.image') }}"
 NEXTCLOUD_WHITEBOARD_VERSION:       "{{ applications | get_app_conf(application_id, 'docker.services.whiteboard.version') }}"
 NEXTCLOUD_WHITEBOARD_ENABLED:       "{{ applications | get_app_conf(application_id, 'plugins.whiteboard.enabled') }}"
-NEXTCLOUD_WHITEBOARD_INTERNAL_PORT: "3002"
+NEXTCLOUD_WHITEBOARD_PORT_INTERNAL: "3002"
 NEXTCLOUD_WHITEBOARD_JWT:           "{{ applications | get_app_conf(application_id, 'credentials.whiteboard_jwt_secret') }}"
 NEXTCLOUD_WHITEBOARD_LOCATION:      "/whiteboard/"
 NEXTCLOUD_WHITEBOARD_URL:           "{{ [ NEXTCLOUD_URL, NEXTCLOUD_WHITEBOARD_LOCATION ] | url_join }}"