diff --git a/roles/docker-nextcloud/templates/docker-compose.yml.j2 b/roles/docker-nextcloud/templates/docker-compose.yml.j2 index 0f6f035e..5404d07e 100644 --- a/roles/docker-nextcloud/templates/docker-compose.yml.j2 +++ b/roles/docker-nextcloud/templates/docker-compose.yml.j2 @@ -47,7 +47,7 @@ services: image: "nextcloud:{{nextcloud_version}}-fpm-alpine" restart: always logging: - driver: journald + driver: journald volumes: - data:/var/www/html entrypoint: /cron.sh diff --git a/roles/docker-turn-server/readme.md b/roles/docker-turn-server/readme.md index f39bea28..c7ef940b 100644 --- a/roles/docker-turn-server/readme.md +++ b/roles/docker-turn-server/readme.md @@ -1,8 +1,10 @@ #role docker-turn-server -optional dependencie for nextcloud talk +May this service needs to be implemented for jitis. It's directly integrated in the docker compose file of role docker-nextcloud ## see - https://nextcloud-talk.readthedocs.io/en/latest/TURN/ - https://hub.docker.com/r/instrumentisto/coturn - https://forum.openmediavault.org/index.php?thread/31782-docker-nextcloud-talk-plugin-and-turnserver/ +- https://markus-blog.de/index.php/2020/11/20/how-to-run-nextcloud-talk-high-performance-backend-with-stun-turnserver-on-ubuntu-with-docker-compose/ +- https://github.com/crazy-max/docker-nextcloud/issues/15 diff --git a/roles/docker-turn-server/tasks/main.yml b/roles/docker-turn-server/tasks/main.yml index 62998e92..a06dfb11 100644 --- a/roles/docker-turn-server/tasks/main.yml +++ b/roles/docker-turn-server/tasks/main.yml @@ -1,9 +1,18 @@ --- -- name: recieve {{turn_server_domain}} certificate - command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{turn_server_domain}} +#- name: recieve {{turn_server_domain}} certificate +# command: certbot certonly --agree-tos --email {{administrator_email}} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{turn_server_domain}} + +- name: "create /home/administrator/volumes/docker/turn-server/" + file: + path: "/home/administrator/volumes/docker/turn-server" + state: directory + mode: 0755 + +- name: configure turnserver.conf + template: src=templates/turnserver.conf.j2 dest=/home/administrator/volumes/docker/turn-server/turnserver.conf - name: recreate turn server command: - cmd: docker run -d --network=host --name "turn_server" instrumentisto/coturn -n --listening-port=3478 --fingerprint --use-auth-secret --static-auth-secret={{turn_server_secret}} --realm={{turn_server_domain}} --total-quota=0 --bps-capacity=0 --stale-nonce --no-multicast-peers -#lt-cred-mech # Only on coTURN below v4.5.0.8! -##no-loopback-peers # Only on coTURN below v4.5.1.0! + cmd: docker run -d -p 3478:3478 -p 3478:3478/udp --name "turn_server" -v "/home/administrator/volumes/docker/turn-server/turnserver.conf:/etc/coturn/turnserver.conf" coturn/coturn +# --mount type=tmpfs,destination=/var/lib/coturn +# -p 49152-65535:49152-65535/udp diff --git a/roles/docker-turn-server/templates/turnserver.conf.j2 b/roles/docker-turn-server/templates/turnserver.conf.j2 new file mode 100644 index 00000000..bb7e0dbb --- /dev/null +++ b/roles/docker-turn-server/templates/turnserver.conf.j2 @@ -0,0 +1,9 @@ +listening-port=3478 +fingerprint +use-auth-secret +static-auth-secret={{turn_server_secret}} +realm={{turn_server_domain}} +total-quota=100 +bps-capacity=0 +stale-nonce +no-multicast-peers