update jitsi

docs/container.md

@@ -0,0 +1,45 @@
+# Required variables
+These variables are required. Example values included. Some general variables might also be required for this role.
+
+```
+docker_service: gitea
+docker_image: gitea/gitea:latest
+
+ports:
+  gitea:
+    http: 8080 # ports[docker_service].http (or https) needed for reverse proxy
+
+```
+
+# Variables for http reverse proxy
+
+```
+reverse_proxy_type: caddy # Defaults to caddy, set to none if no reverse proxy is needed. Supported values: none, caddy, traefik
+docker_image_http_port: 3000 # the port used inside the container for http
+
+docker_vhost_domains: 
+  gitea:
+    - git.domain.tld
+
+
+```
+
+# Other optional variables
+
+```
+docker_database: postgres # Database to set up in a separate container, supports postgres and mongo
+database_passwords: # Needed for postgres
+  gitea: secret
+
+docker_volumes:
+  - gitea_data:/data
+  - /var/lib/gitea/.ssh:/data/git/.ssh
+docker_published_ports:
+  - "127.0.0.1:{{ ports.gitea.ssh }}:22"
+docker_env:
+  USER_UID: 2132
+  GITEA__database__DB_TYPE: postgres
+
+docker_network_mode: host # Usually you don't want to define this
+
+```

docs/jitsi.md

@@ -7,3 +7,11 @@ ports:
 
 jitsi_domain: 'jitsi.domain.tld'
 ```
+
+These vars are optional:
+
+```
+# for TURN, no turn server is used if not defined
+turn_domain: turn.domain.tld
+turn_secret: secret
+```

docs/unifi.md

@@ -0,0 +1,14 @@
+Unifi is installed with host network mode.
+
+# Required variables
+These variables are required. Example values included. Some general variables might also be required for this role.
+
+```
+ports:
+  unifi:
+    https: 8443
+
+docker_vhost_domains: 
+  unifi:
+    - unifi.domain.tld
+```

galaxy.yml

@@ -2,7 +2,7 @@
 
 namespace: uumas
 name: docker
-version: 0.5.3
+version: 0.5.5
 readme: README.md
 repository: https://git.uumas.fi/uumas/ansible-docker
 license_file: LICENSE

roles/jitsi/defaults/main.yml

@@ -0,0 +1,4 @@
+---
+
+jitsi_docker_tag: stable
+

roles/jitsi/tasks/main.yml

@@ -16,7 +16,7 @@
 - name: Jitsi meet web
   docker_container:
     name: 'jitsi_meet_web'
-    image: 'jitsi/web:latest'
+    image: "jitsi/web:{{ jitsi_docker_tag }}"
     pull: true
     container_default_behavior: no_defaults
     published_ports: "{{ jitsi_web_published_ports | default(omit) }}"
@@ -41,23 +41,10 @@
           - meet.jitsi
   register: jitsi_meet_web_out
 
-- set_fact:
-    jitsi_meet_web_config_volume: "{{ jitsi_meet_web_out.container.Mounts | selectattr('Destination', 'equalto', '/config') | join }}"
-
-- name: Disable recording and livestreaming
-  lineinfile:
-    path: "{{ jitsi_meet_web_config_volume.Source }}/config.js"
-    regexp: "^    (\/\/ )?{{ item }}: .*,$"
-    line: "    {{ item }}: false,"
-    state: present
-  loop:
-    - fileRecordingsEnabled
-    - liveStreamingEnabled
-
 - name: Jitsi meet prosody
   docker_container:
     name: 'jitsi_meet_prosody'
-    image: 'jitsi/prosody:latest'
+    image: "jitsi/prosody:{{ jitsi_docker_tag }}"
     pull: true
     container_default_behavior: no_defaults
     env:
@@ -69,6 +56,11 @@
       JICOFO_AUTH_PASSWORD: "{{ jitsi_pw.jicofo_auth }}"
       JVB_AUTH_USER: jvb
       JVB_AUTH_PASSWORD: "{{ jitsi_pw.jvb_auth }}"
+      TURN_CREDENTIALS: "{{ turn_secret | default(omit) }}"
+      TURN_HOST: "{{ turn_domain | default(omit) }}"
+      TURN_PORT: "{{ '443' if turn_domain is defined else omit }}"
+      TURNS_HOST: "{{ turn_domain | default(omit) }}"
+      TURNS_PORT: "{{ '443' if turn_domain is defined else omit }}"
       XMPP_DOMAIN: meet.jitsi
       XMPP_AUTH_DOMAIN: auth.meet.jitsi
       XMPP_INTERNAL_MUC_DOMAIN: internal-muc.meet.jitsi
@@ -85,7 +77,7 @@
 - name: Jitsi meet jicofo
   docker_container:
     name: 'jitsi_meet_jicofo'
-    image: 'jitsi/jicofo:latest'
+    image: "jitsi/jicofo:{{ jitsi_docker_tag }}"
     pull: true
     container_default_behavior: no_defaults
     env:
@@ -108,7 +100,7 @@
 - name: Jitsi meet video bridge
   docker_container:
     name: 'jitsi_meet_jvb'
-    image: 'jitsi/jvb:latest'
+    image: "jitsi/jvb:{{ jitsi_docker_tag }}"
     pull: true
     container_default_behavior: no_defaults
     published_ports: