finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make it possible to control Coturn ports and listen interfaces

Browse Source 
Related to #330 (Github Issue).
This commit is contained in:
Slavi Pantaleev 2019-12-20 12:21:43 +02:00
parent 89dbe5cfc5
commit 9a33e5c7ad
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
roles/matrix-coturn/defaults/main.yml
View File

@ -27,14 +27,32 @@ matrix_coturn_container_additional_volumes: []
# A list of extra arguments to pass to the container # A list of extra arguments to pass to the container
matrix_coturn_container_extra_arguments: [] matrix_coturn_container_extra_arguments: []
# A shared secret (between Synapse and Coturn) used for authentication. # Controls whether the Coturn container exposes its plain STUN port (tcp/3478 and udp/3478 in the container).
# You can put any string here, but generating a strong one is preferred (e.g. `pwgen -s 64 1`). #
matrix_coturn_turn_static_auth_secret: "" # Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:3478"), or empty string to not expose.
matrix_coturn_container_stun_plain_host_bind_port: '3478'
# Controls whether the Coturn container exposes its TLS STUN port (tcp/5349 and udp/5349 in the container).
#
# Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:5349"), or empty string to not expose.
matrix_coturn_container_stun_tls_host_bind_port: '5349'
# Controls whether the Coturn container exposes its TURN UDP port range and which interface to do it on.
#
# Takes an interface "<ip address>" (e.g. "127.0.0.1"), or empty string to listen on all interfaces.
# Takes a null/none value (`~`) to prevent listening.
#
# The UDP port-range itself is specified using `matrix_coturn_turn_udp_min_port` and `matrix_coturn_turn_udp_max_port`.
matrix_coturn_container_turn_range_listen_interface: ''
# UDP port-range to use for TURN # UDP port-range to use for TURN
matrix_coturn_turn_udp_min_port: 49152 matrix_coturn_turn_udp_min_port: 49152
matrix_coturn_turn_udp_max_port: 49172 matrix_coturn_turn_udp_max_port: 49172
# A shared secret (between Synapse and Coturn) used for authentication.
# You can put any string here, but generating a strong one is preferred (e.g. `pwgen -s 64 1`).
matrix_coturn_turn_static_auth_secret: ""
# The external IP address of the machine where Coturn is. # The external IP address of the machine where Coturn is.
matrix_coturn_turn_external_ip_address: '' matrix_coturn_turn_external_ip_address: ''

16
roles/matrix-coturn/templates/systemd/matrix-coturn.service.j2
View File

@ -19,11 +19,17 @@ ExecStart=/usr/bin/docker run --rm --name matrix-coturn \
--read-only \ --read-only \
--tmpfs=/var/tmp:rw,noexec,nosuid,size=100m \ --tmpfs=/var/tmp:rw,noexec,nosuid,size=100m \
--network={{ matrix_coturn_docker_network }} \ --network={{ matrix_coturn_docker_network }} \
-p 3478:3478 \ {% if matrix_coturn_container_stun_plain_host_bind_port != '' %}
-p 3478:3478/udp \ -p {{ matrix_coturn_container_stun_plain_host_bind_port }}:3478 \
-p 5349:5349 \ -p {{ matrix_coturn_container_stun_plain_host_bind_port }}:3478/udp \
-p 5349:5349/udp \ {% endif %}
-p {{ matrix_coturn_turn_udp_min_port }}-{{ matrix_coturn_turn_udp_max_port }}:{{ matrix_coturn_turn_udp_min_port }}-{{ matrix_coturn_turn_udp_max_port }}/udp \ {% if matrix_coturn_container_stun_tls_host_bind_port != '' %}
-p {{ matrix_coturn_container_stun_tls_host_bind_port }}:5349 \
-p {{ matrix_coturn_container_stun_tls_host_bind_port }}:5349/udp \
{% endif %}
{% if matrix_coturn_container_turn_range_listen_interface is not none %}
-p {{ matrix_coturn_container_turn_range_listen_interface }}{{ ':' if matrix_coturn_container_turn_range_listen_interface else '' }}{{ matrix_coturn_turn_udp_min_port }}-{{ matrix_coturn_turn_udp_max_port }}:{{ matrix_coturn_turn_udp_min_port }}-{{ matrix_coturn_turn_udp_max_port }}/udp \
{% endif %}
-v {{ matrix_coturn_config_path }}:/turnserver.conf:ro \ -v {{ matrix_coturn_config_path }}:/turnserver.conf:ro \
{% for volume in matrix_coturn_container_additional_volumes %} {% for volume in matrix_coturn_container_additional_volumes %}
-v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \ -v {{ volume.src }}:{{ volume.dst }}:{{ volume.options }} \