From 268b079374a74b418a87f6fd05ea90d56511cab9 Mon Sep 17 00:00:00 2001
From: heftyzauk <80178101+heftyzauk@users.noreply.github.com>
Date: Mon, 11 Apr 2022 11:50:41 +0100
Subject: [PATCH] Revert Coturn Address Change, add new Addresses var (#2)

---
 group_vars/matrix_servers                        | 3 ++-
 roles/matrix-coturn/defaults/main.yml            | 3 ++-
 roles/matrix-coturn/templates/turnserver.conf.j2 | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 92df1bd47..49f1f0918 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -1144,7 +1144,8 @@ matrix_coturn_enabled: true
 
 matrix_coturn_container_image_self_build: "{{ matrix_architecture != 'amd64' }}"
 
-matrix_coturn_turn_external_ip_address: ["{{ ansible_host }}"]
+matrix_coturn_turn_external_ip_address: "{{ ansible_host }}"
+matrix_coturn_turn_external_ip_addresses: [ "{{ matrix_coturn_turn_external_ip_address }}" ]
 
 matrix_coturn_turn_static_auth_secret: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'coturn.sas') | to_uuid }}"
 
diff --git a/roles/matrix-coturn/defaults/main.yml b/roles/matrix-coturn/defaults/main.yml
index c47430895..39790bacc 100644
--- a/roles/matrix-coturn/defaults/main.yml
+++ b/roles/matrix-coturn/defaults/main.yml
@@ -64,7 +64,8 @@ matrix_coturn_turn_udp_max_port: 49172
 matrix_coturn_turn_static_auth_secret: ""
 
 # The external IP address of the machine where Coturn is.
-matrix_coturn_turn_external_ip_address: []
+matrix_coturn_turn_external_ip_address: ''
+matrix_coturn_turn_external_ip_addresses: []
 
 matrix_coturn_allowed_peer_ips: []
 matrix_coturn_denied_peer_ips: []
diff --git a/roles/matrix-coturn/templates/turnserver.conf.j2 b/roles/matrix-coturn/templates/turnserver.conf.j2
index dfa9f4cc7..2b1ee4f6e 100644
--- a/roles/matrix-coturn/templates/turnserver.conf.j2
+++ b/roles/matrix-coturn/templates/turnserver.conf.j2
@@ -5,7 +5,7 @@ realm=turn.{{ matrix_server_fqn_matrix }}
 
 min-port={{ matrix_coturn_turn_udp_min_port }}
 max-port={{ matrix_coturn_turn_udp_max_port }}
-{% for ip in matrix_coturn_turn_external_ip_address %}
+{% for ip in matrix_coturn_turn_external_ip_addresses %}
 external-ip={{ ip }}
 {% endfor %}