diff --git a/roles/web-svc-coturn/config/main.yml b/roles/web-svc-coturn/config/main.yml index bbb27480..a24e72a6 100644 --- a/roles/web-svc-coturn/config/main.yml +++ b/roles/web-svc-coturn/config/main.yml @@ -12,6 +12,7 @@ docker: mem_reservation: 512m mem_limit: 1g pids_limit: 256 + network_mode: host redis: enabled: false database: diff --git a/roles/web-svc-coturn/schema/main.yml b/roles/web-svc-coturn/schema/main.yml index 8b2761e7..cc96a74f 100644 --- a/roles/web-svc-coturn/schema/main.yml +++ b/roles/web-svc-coturn/schema/main.yml @@ -1,7 +1,7 @@ credentials: user_password: description: "Long-Term Credential password for clients" - algorithm: "alphanumeric_32" + algorithm: "random_hex" validation: "^[A-Za-z0-9]{32}$" auth_secret: description: "TURN-REST static auth secret" diff --git a/roles/web-svc-coturn/templates/docker-compose.yml.j2 b/roles/web-svc-coturn/templates/docker-compose.yml.j2 index 1b374471..f1e44fc9 100644 --- a/roles/web-svc-coturn/templates/docker-compose.yml.j2 +++ b/roles/web-svc-coturn/templates/docker-compose.yml.j2 @@ -4,12 +4,15 @@ {% include 'roles/docker-container/templates/base.yml.j2' %} image: {{ COTURN_IMAGE }}:{{ COTURN_VERSION }} container_name: {{ COTURN_VOLUME }} + network_mode: {{ COTURN_NETWORK_MODE }} +{% if COTURN_NETWORK_MODE == 'bridge' %} ports: - "{{ COTURN_TURN_PORT }}:{{ COTURN_TURN_PORT }}/udp" - "{{ COTURN_TURN_PORT }}:{{ COTURN_TURN_PORT }}/tcp" - "{{ COTURN_STUN_PORT }}:{{ COTURN_STUN_PORT }}/tcp" - "{{ COTURN_STUN_PORT }}:{{ COTURN_STUN_PORT }}/udp" - "{{ COTURN_RELAY_PORT_RANGE }}/udp" +{% endif %} volumes: - "{{ COTURN_TLS_CERT_PATH }}:{{ COTURN_TLS_CERT_PATH }}:ro" - "{{ COTURN_TLS_KEY_PATH }}:{{ COTURN_TLS_KEY_PATH }}:ro" diff --git a/roles/web-svc-coturn/vars/main.yml b/roles/web-svc-coturn/vars/main.yml index c9e60594..0104ad88 100644 --- a/roles/web-svc-coturn/vars/main.yml +++ b/roles/web-svc-coturn/vars/main.yml @@ -10,6 +10,7 @@ COTURN_VERSION: "{{ applications | get_app_conf(application_id, 'doc COTURN_IMAGE: "{{ applications | get_app_conf(application_id, 'docker.services.' ~ entity_name ~ '.image') }}" COTURN_VOLUME: "{{ entity_name }}" COTURN_REALM: "{{ domain }}" +COTURN_NETWORK_MODE: "{{ applications | get_app_conf(application_id, 'docker.services.' ~ entity_name ~ '.network_mode') }}" ## Ports COTURN_TURN_PORT: "{{ ports.public.turn[application_id] }}"