From c6858d2a084e8c56e31eef58434f1768643b5f68 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 18 Mar 2019 17:04:40 +0200 Subject: [PATCH] Define matrix_coturn_turn_external_ip_address in the playbook group vars This is more explicit than hiding it in the role defaults. People who reuse the roles in their own playbook (and not only) may incorrectly define `ansible_host` to be a hostname or some local address. Making it more explicit is more likely to prevent such mistakes. --- group_vars/matrix-servers | 1 + roles/matrix-coturn/defaults/main.yml | 4 +++- roles/matrix-coturn/tasks/validate_config.yml | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/group_vars/matrix-servers b/group_vars/matrix-servers index a93467cae..404fc6e34 100755 --- a/group_vars/matrix-servers +++ b/group_vars/matrix-servers @@ -90,6 +90,7 @@ matrix_corporal_matrix_registration_shared_secret: "{{ matrix_synapse_registrati ###################################################################### matrix_coturn_enabled: true +matrix_coturn_turn_external_ip_address: "{{ ansible_host }}" ###################################################################### # diff --git a/roles/matrix-coturn/defaults/main.yml b/roles/matrix-coturn/defaults/main.yml index 5b7dbbe91..d43d4d1c8 100644 --- a/roles/matrix-coturn/defaults/main.yml +++ b/roles/matrix-coturn/defaults/main.yml @@ -16,7 +16,9 @@ matrix_coturn_turn_static_auth_secret: "" matrix_coturn_turn_udp_min_port: 49152 matrix_coturn_turn_udp_max_port: 49172 -matrix_coturn_turn_external_ip_address: "{{ ansible_host }}" +# The external IP address of the machine where Coturn is. +matrix_coturn_turn_external_ip_address: '' + matrix_coturn_allowed_peer_ips: [] matrix_coturn_denied_peer_ips: [] matrix_coturn_user_quota: null diff --git a/roles/matrix-coturn/tasks/validate_config.yml b/roles/matrix-coturn/tasks/validate_config.yml index c62b56d33..39019982f 100644 --- a/roles/matrix-coturn/tasks/validate_config.yml +++ b/roles/matrix-coturn/tasks/validate_config.yml @@ -6,4 +6,5 @@ You need to define a required configuration setting (`{{ item }}`) for using Coturn. when: "vars[item] == ''" with_items: - - "matrix_coturn_turn_static_auth_secret" \ No newline at end of file + - "matrix_coturn_turn_external_ip_address" + - "matrix_coturn_turn_static_auth_secret"