Просмотр исходного кода

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.
pull/126/head
Slavi Pantaleev 7 лет назад
Родитель
Сommit
c6858d2a08
3 измененных файлов: 6 добавлений и 2 удалений
  1. +1
    -0
      group_vars/matrix-servers
  2. +3
    -1
      roles/matrix-coturn/defaults/main.yml
  3. +2
    -1
      roles/matrix-coturn/tasks/validate_config.yml

+ 1
- 0
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 }}"

######################################################################
#


+ 3
- 1
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


+ 2
- 1
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"
- "matrix_coturn_turn_external_ip_address"
- "matrix_coturn_turn_static_auth_secret"

Загрузка…
Отмена
Сохранить