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

Merge pull request #1009 from thedanbob/coturn-official

Switch to official coturn image
pull/1013/head
Slavi Pantaleev 4 лет назад
committed by GitHub
Родитель
Сommit
7eda6a3c12
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 4AEE18F83AFDEB23
3 измененных файлов: 4 добавлений и 3 удалений
  1. +1
    -1
      docs/container-images.md
  2. +2
    -2
      roles/matrix-coturn/defaults/main.yml
  3. +1
    -0
      roles/matrix-coturn/templates/systemd/matrix-coturn.service.j2

+ 1
- 1
docs/container-images.md Просмотреть файл

@@ -11,7 +11,7 @@ These services are enabled and used by default, but you can turn them off, if yo

- [matrixdotorg/synapse](https://hub.docker.com/r/matrixdotorg/synapse/) - the official [Synapse](https://github.com/matrix-org/synapse) Matrix homeserver (optional)

- [instrumentisto/coturn](https://hub.docker.com/r/instrumentisto/coturn/) - the [Coturn](https://github.com/coturn/coturn) STUN/TURN server (optional)
- [coturn/coturn](https://hub.docker.com/r/coturn/coturn/) - the [Coturn](https://github.com/coturn/coturn) STUN/TURN server (optional)

- [vectorim/element-web](https://hub.docker.com/r/vectorim/element-web/) - the [Element](https://element.io/) web client (optional)



+ 2
- 2
roles/matrix-coturn/defaults/main.yml Просмотреть файл

@@ -1,10 +1,10 @@
matrix_coturn_enabled: true

matrix_coturn_container_image_self_build: false
matrix_coturn_container_image_self_build_repo: "https://github.com/instrumentisto/coturn-docker-image.git"
matrix_coturn_container_image_self_build_repo: "https://github.com/coturn/coturn/tree/master/docker/coturn/alpine.git"

matrix_coturn_version: 4.5.2
matrix_coturn_docker_image: "{{ matrix_coturn_docker_image_name_prefix }}instrumentisto/coturn:{{ matrix_coturn_version }}"
matrix_coturn_docker_image: "{{ matrix_coturn_docker_image_name_prefix }}coturn/coturn:{{ matrix_coturn_version }}"
matrix_coturn_docker_image_name_prefix: "{{ 'localhost/' if matrix_coturn_container_image_self_build else matrix_container_global_registry_prefix }}"
matrix_coturn_docker_image_force_pull: "{{ matrix_coturn_docker_image.endswith(':latest') }}"



+ 1
- 0
roles/matrix-coturn/templates/systemd/matrix-coturn.service.j2 Просмотреть файл

@@ -17,6 +17,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-coturn \
--log-driver=none \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
--cap-drop=ALL \
--cap-add=NET_BIND_SERVICE \
--entrypoint=turnserver \
--read-only \
--tmpfs=/var/tmp:rw,noexec,nosuid,size=100m \


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