Compare commits
2 commits
eaec14a23f
...
63f8b54302
Author | SHA1 | Date | |
---|---|---|---|
63f8b54302 | |||
89a5c35710 |
6 changed files with 36 additions and 1 deletions
|
@ -45,6 +45,7 @@ Role Variables
|
||||||
| jitsi_public_url | The public URL under which Jitsi Meet can be accessed | http://localhost |
|
| jitsi_public_url | The public URL under which Jitsi Meet can be accessed | http://localhost |
|
||||||
| jitsi_timezone | | Europe/Amsterdam |
|
| jitsi_timezone | | Europe/Amsterdam |
|
||||||
| jitsi_virtual_host | The virtual host that is e.g. used by Traefik, usually part of the public url | localhost |
|
| jitsi_virtual_host | The virtual host that is e.g. used by Traefik, usually part of the public url | localhost |
|
||||||
|
| jitsi_expose_metrics | Determine whether an additional expoerter for the Jitsi metrics shall be run | False |
|
||||||
|
|
||||||
\* It is important to provide a dedicated secure password for each service. Generate passwords with e.g. `openssl rand -hex 16`
|
\* It is important to provide a dedicated secure password for each service. Generate passwords with e.g. `openssl rand -hex 16`
|
||||||
|
|
||||||
|
|
|
@ -17,5 +17,6 @@ jitsi_web_channel_last_n: 3
|
||||||
jitsi_build_latest_image_from_source: yes
|
jitsi_build_latest_image_from_source: yes
|
||||||
jitsi_docker_upstream_repo_url: https://github.com/jitsi/docker-jitsi-meet.git
|
jitsi_docker_upstream_repo_url: https://github.com/jitsi/docker-jitsi-meet.git
|
||||||
jitsi_enable_third_party_requests: no
|
jitsi_enable_third_party_requests: no
|
||||||
|
jitsi_expose_metrics: False
|
||||||
# Internal variables
|
# Internal variables
|
||||||
jitsi_multitenant_postfix: "{{ '_' + jitsi_multitenant_label if (jitsi_multitenant_label) else '' }}"
|
jitsi_multitenant_postfix: "{{ '_' + jitsi_multitenant_label if (jitsi_multitenant_label) else '' }}"
|
2
src
2
src
|
@ -1 +1 @@
|
||||||
Subproject commit eae3f5ce2d7627afe4115f52a61cc7ae3e3e8a31
|
Subproject commit 9b686c6f4aa74cd33ddcd4dd35decc76a9470e1e
|
|
@ -62,6 +62,16 @@
|
||||||
mode: '0640'
|
mode: '0640'
|
||||||
tags: config
|
tags: config
|
||||||
|
|
||||||
|
- name: Provide metric exporter environment
|
||||||
|
template:
|
||||||
|
src: templates/exporter.env.j2
|
||||||
|
dest: "{{ jitsi_install_path }}/jitsi/exporter.env"
|
||||||
|
owner: "{{ jitsi_install_user }}"
|
||||||
|
group: "{{ jitsi_install_user }}"
|
||||||
|
mode: '0640'
|
||||||
|
tags: config
|
||||||
|
when: jitsi_expose_metrics
|
||||||
|
|
||||||
- name: "docker-compose: Teardown existing Jitsi service"
|
- name: "docker-compose: Teardown existing Jitsi service"
|
||||||
docker_compose:
|
docker_compose:
|
||||||
project_src: "{{ jitsi_install_path }}/jitsi/"
|
project_src: "{{ jitsi_install_path }}/jitsi/"
|
||||||
|
|
|
@ -87,6 +87,7 @@ services:
|
||||||
- LDAP_TLS_CACERT_FILE
|
- LDAP_TLS_CACERT_FILE
|
||||||
- LDAP_TLS_CACERT_DIR
|
- LDAP_TLS_CACERT_DIR
|
||||||
- LDAP_START_TLS
|
- LDAP_START_TLS
|
||||||
|
- PUBLIC_URL
|
||||||
- XMPP_DOMAIN
|
- XMPP_DOMAIN
|
||||||
- XMPP_AUTH_DOMAIN
|
- XMPP_AUTH_DOMAIN
|
||||||
- XMPP_GUEST_DOMAIN
|
- XMPP_GUEST_DOMAIN
|
||||||
|
@ -130,6 +131,7 @@ services:
|
||||||
- ${CONFIG}/jicofo:/config
|
- ${CONFIG}/jicofo:/config
|
||||||
environment:
|
environment:
|
||||||
- ENABLE_AUTH
|
- ENABLE_AUTH
|
||||||
|
- PUBLIC_URL
|
||||||
- XMPP_DOMAIN
|
- XMPP_DOMAIN
|
||||||
- XMPP_AUTH_DOMAIN
|
- XMPP_AUTH_DOMAIN
|
||||||
- XMPP_INTERNAL_MUC_DOMAIN
|
- XMPP_INTERNAL_MUC_DOMAIN
|
||||||
|
@ -159,6 +161,7 @@ services:
|
||||||
- ${CONFIG}/jvb:/config
|
- ${CONFIG}/jvb:/config
|
||||||
environment:
|
environment:
|
||||||
- DOCKER_HOST_ADDRESS
|
- DOCKER_HOST_ADDRESS
|
||||||
|
- PUBLIC_URL
|
||||||
- XMPP_AUTH_DOMAIN
|
- XMPP_AUTH_DOMAIN
|
||||||
- XMPP_INTERNAL_MUC_DOMAIN
|
- XMPP_INTERNAL_MUC_DOMAIN
|
||||||
- XMPP_SERVER
|
- XMPP_SERVER
|
||||||
|
@ -176,6 +179,20 @@ services:
|
||||||
networks:
|
networks:
|
||||||
meet.jitsi:
|
meet.jitsi:
|
||||||
|
|
||||||
|
{% if jitsi_expose_metrics %}
|
||||||
|
# Data exporter
|
||||||
|
exporter:
|
||||||
|
image: goberle/jitsi-prom-exporter
|
||||||
|
restart: unless-stopped
|
||||||
|
env_file: exporter.env
|
||||||
|
depends_on:
|
||||||
|
- jicofo
|
||||||
|
networks:
|
||||||
|
# Expose the data exporter to the public network managed by traefik
|
||||||
|
public:
|
||||||
|
meet.jitsi:
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
# Custom network so all services can communicate using a FQDN
|
# Custom network so all services can communicate using a FQDN
|
||||||
networks:
|
networks:
|
||||||
meet.jitsi:
|
meet.jitsi:
|
||||||
|
|
6
templates/exporter.env.j2
Normal file
6
templates/exporter.env.j2
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
XMPP_USER={{ jitsi_jicofo_auth_user }}
|
||||||
|
XMPP_PW={{ jitsi_jicofo_auth_password }}
|
||||||
|
XMPP_SERVER=xmpp.meet.jitsi
|
||||||
|
XMPP_PORT=5222
|
||||||
|
XMPP_AUTH_DOMAIN=auth.meet.jitsi
|
||||||
|
XMPP_INTERNAL_MUC_DOMAIN=internal-muc.meet.jitsi
|
Loading…
Add table
Reference in a new issue