From 9b17c0548d55fc43a00e2a21ff2ce5f81655bdcf Mon Sep 17 00:00:00 2001 From: Matthias Herzog <37505324+kegato@users.noreply.github.com> Date: Tue, 7 Jan 2020 17:00:45 +0100 Subject: [PATCH 01/11] web: fix letsencrypt renewal --- web/rootfs/etc/cont-init.d/10-config | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/web/rootfs/etc/cont-init.d/10-config b/web/rootfs/etc/cont-init.d/10-config index 5bf08a6..075ad4b 100644 --- a/web/rootfs/etc/cont-init.d/10-config +++ b/web/rootfs/etc/cont-init.d/10-config @@ -18,7 +18,16 @@ if [[ $DISABLE_HTTPS -ne 1 ]]; then -d $LETSENCRYPT_DOMAIN \ --agree-tos \ --email $LETSENCRYPT_EMAIL - cp /defaults/letsencrypt-renew /etc/cron.monthly/ + fi + + # remove default certbot renewal + if [[ -f /etc/cron.d/certbot ]]; then + rm /etc/cron.d/certbot + fi + + # setup certbot renewal script + if [[ ! -f /etc/cron.daily/letencrypt-renew ]]; then + cp /defaults/letsencrypt-renew /etc/cron.daily/ fi else # use self-signed certs From 2b9a13bfef728fa37d4be168cc30016fb85b6dde Mon Sep 17 00:00:00 2001 From: Mohammed Date: Tue, 28 Jan 2020 08:53:19 +0100 Subject: [PATCH 02/11] jicofo: add support of reservation REST API --- docker-compose.yml | 1 + env.example | 3 +++ jicofo/rootfs/defaults/sip-communicator.properties | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 589e1a5..b6aad95 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -118,6 +118,7 @@ services: - JICOFO_COMPONENT_SECRET - JICOFO_AUTH_USER - JICOFO_AUTH_PASSWORD + - JICOFO_RESERVATION_REST_BASE_URL - JVB_BREWERY_MUC - JIGASI_BREWERY_MUC - JIBRI_BREWERY_MUC diff --git a/env.example b/env.example index 69f032b..bea835f 100644 --- a/env.example +++ b/env.example @@ -201,6 +201,9 @@ JICOFO_AUTH_USER=focus # XMPP password for Jicofo client connections. JICOFO_AUTH_PASSWORD=passw0rd +# Base URL of Jicofo's reservation REST API +#JICOFO_RESERVATION_REST_BASE_URL=http://reservation.example.com + # XMPP user for Jigasi MUC client connections. JIGASI_XMPP_USER=jigasi diff --git a/jicofo/rootfs/defaults/sip-communicator.properties b/jicofo/rootfs/defaults/sip-communicator.properties index 0c7d23a..c28b7b2 100644 --- a/jicofo/rootfs/defaults/sip-communicator.properties +++ b/jicofo/rootfs/defaults/sip-communicator.properties @@ -13,3 +13,7 @@ org.jitsi.jicofo.jigasi.BREWERY={{ .Env.JIGASI_BREWERY_MUC}}@{{ .Env.XMPP_INTERN {{ if .Env.ENABLE_AUTH | default "0" | toBool }} org.jitsi.jicofo.auth.URL=XMPP:{{ .Env.XMPP_DOMAIN }} {{ end }} + +{{ if .Env.JICOFO_RESERVATION_REST_BASE_URL }} +org.jitsi.impl.reservation.rest.BASE_URL={{ .Env.JICOFO_RESERVATION_REST_BASE_URL }} +{{ end }} From 69ba9ff8c38ecfa5ce0b15402809b7b4da274cf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=8F=D0=BD=20=D0=9C=D0=B8=D0=BD=D0=BA?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Tue, 28 Jan 2020 16:08:05 +0000 Subject: [PATCH 03/11] jigasi: Updates jigasi client default options. --- jigasi/rootfs/defaults/sip-communicator.properties | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jigasi/rootfs/defaults/sip-communicator.properties b/jigasi/rootfs/defaults/sip-communicator.properties index 3e70206..c1a77b3 100644 --- a/jigasi/rootfs/defaults/sip-communicator.properties +++ b/jigasi/rootfs/defaults/sip-communicator.properties @@ -109,6 +109,12 @@ org.jitsi.jigasi.HEALTH_CHECK_TIMEOUT=600000 org.jitsi.jigasi.xmpp.acc.IS_SERVER_OVERRIDDEN=true org.jitsi.jigasi.xmpp.acc.SERVER_ADDRESS={{ .Env.XMPP_SERVER }} +org.jitsi.jigasi.xmpp.acc.VIDEO_CALLING_DISABLED=true +org.jitsi.jigasi.xmpp.acc.JINGLE_NODES_ENABLED=false +org.jitsi.jigasi.xmpp.acc.AUTO_DISCOVER_STUN=false +org.jitsi.jigasi.xmpp.acc.IM_DISABLED=true +org.jitsi.jigasi.xmpp.acc.SERVER_STORED_INFO_DISABLED=true +org.jitsi.jigasi.xmpp.acc.IS_FILE_TRANSFER_DISABLED=true {{ if .Env.ENABLE_AUTH | default "0" | toBool }} org.jitsi.jigasi.xmpp.acc.USER_ID={{ .Env.JIGASI_XMPP_USER }}@{{ .Env.XMPP_AUTH_DOMAIN }} org.jitsi.jigasi.xmpp.acc.PASS={{ .Env.JIGASI_XMPP_PASSWORD }} From 6eebabdc2413fdb63f3c738c540cec1fca8fd861 Mon Sep 17 00:00:00 2001 From: mjattiot Date: Tue, 4 Feb 2020 13:52:41 +0100 Subject: [PATCH 04/11] jicofo: set owner jicofo rights for /config directory --- jicofo/rootfs/etc/cont-init.d/10-config | 1 + 1 file changed, 1 insertion(+) diff --git a/jicofo/rootfs/etc/cont-init.d/10-config b/jicofo/rootfs/etc/cont-init.d/10-config index 8e7b0f4..b9d96a6 100644 --- a/jicofo/rootfs/etc/cont-init.d/10-config +++ b/jicofo/rootfs/etc/cont-init.d/10-config @@ -8,3 +8,4 @@ if [[ ! -f /config/logging.properties ]]; then cp /defaults/logging.properties /config fi +chown -R jicofo:jitsi /config \ No newline at end of file From 5423a8ae51a3007279282632e9dc2d24bb6eb707 Mon Sep 17 00:00:00 2001 From: Dmitry Mishin Date: Tue, 11 Feb 2020 10:45:22 -0800 Subject: [PATCH 05/11] examples: adding simple kubernetes example --- examples/kubernetes/README.md | 26 +++++ examples/kubernetes/deployment.yaml | 143 +++++++++++++++++++++++++++ examples/kubernetes/jvb-service.yaml | 17 ++++ examples/kubernetes/web-service.yaml | 32 ++++++ 4 files changed, 218 insertions(+) create mode 100644 examples/kubernetes/README.md create mode 100644 examples/kubernetes/deployment.yaml create mode 100644 examples/kubernetes/jvb-service.yaml create mode 100644 examples/kubernetes/web-service.yaml diff --git a/examples/kubernetes/README.md b/examples/kubernetes/README.md new file mode 100644 index 0000000..8158dbc --- /dev/null +++ b/examples/kubernetes/README.md @@ -0,0 +1,26 @@ +# Install guide for kubernetes + +This guide will deploy jitsi in the most simple way: as several containers in a single pod. This is enough to start in case your hardware is enough. If you need to scale components to severa instance, you'll have to modify it to use several services and pods. + +Create a namespace to deploy jitsi to: + +`kubectl create namespace jitsi` + +Add the secret with secret values (replace `...` with some random strings): + +`kubectl create secret generic jitsi-config --from-literal=JICOFO_COMPONENT_SECRET=... --from-literal=JICOFO_AUTH_PASSWORD=... --from-literal=JVB_AUTH_PASSWORD=... ` + +Deploy the service to listen for JVB UDP traffic on all cluster nodes port 30300: + +`kubectl create -f jvb-service.yaml` + +Now we can deploy the rest of the application: + +`kubectl create -f deployment.yaml` + +To expose the webapp, we can use Ingress (replace the `host` value with your actual hostname): + +`kubectl create -f web-service.yaml` + +You can either use "https" or "http" service port, depending on whether your ingress allows self-signed certs. + diff --git a/examples/kubernetes/deployment.yaml b/examples/kubernetes/deployment.yaml new file mode 100644 index 0000000..144585f --- /dev/null +++ b/examples/kubernetes/deployment.yaml @@ -0,0 +1,143 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + k8s-app: jitsi + name: jitsi + namespace: jitsi +spec: + replicas: 1 + strategy: + type: Recreate + selector: + matchLabels: + k8s-app: jitsi + template: + metadata: + labels: + k8s-app: jitsi + spec: + containers: + - name: jicofo + image: jitsi/jicofo + imagePullPolicy: Always + env: + - name: XMPP_SERVER + value: localhost + - name: XMPP_DOMAIN + value: meet.jitsi + - name: XMPP_AUTH_DOMAIN + value: auth.meet.jitsi + - name: XMPP_INTERNAL_MUC_DOMAIN + value: internal-muc.meet.jitsi + - name: JICOFO_COMPONENT_SECRET + valueFrom: + secretKeyRef: + name: jitsi-config + key: JICOFO_COMPONENT_SECRET + - name: JICOFO_AUTH_USER + value: focus + - name: JICOFO_AUTH_PASSWORD + valueFrom: + secretKeyRef: + name: jitsi-config + key: JICOFO_AUTH_PASSWORD + - name: TZ + value: America/Los_Angeles + - name: JVB_BREWERY_MUC + value: jvbbrewery + - name: prosody + image: jitsi/prosody + imagePullPolicy: Always + env: + - name: XMPP_DOMAIN + value: meet.jitsi + - name: XMPP_AUTH_DOMAIN + value: auth.meet.jitsi + - name: XMPP_MUC_DOMAIN + value: muc.meet.jitsi + - name: XMPP_INTERNAL_MUC_DOMAIN + value: internal-muc.meet.jitsi + - name: JICOFO_COMPONENT_SECRET + valueFrom: + secretKeyRef: + name: jitsi-config + key: JICOFO_COMPONENT_SECRET + - name: JVB_AUTH_USER + value: jvb + - name: JVB_AUTH_PASSWORD + valueFrom: + secretKeyRef: + name: jitsi-config + key: JVB_AUTH_PASSWORD + - name: JICOFO_AUTH_USER + value: focus + - name: JICOFO_AUTH_PASSWORD + valueFrom: + secretKeyRef: + name: jitsi-config + key: JICOFO_AUTH_PASSWORD + - name: TZ + value: America/Los_Angeles + - name: JVB_TCP_HARVESTER_DISABLED + value: "true" + - name: web + image: jitsi/web + imagePullPolicy: Always + env: + - name: XMPP_SERVER + value: localhost + - name: JICOFO_AUTH_USER + value: focus + - name: XMPP_DOMAIN + value: meet.jitsi + - name: XMPP_AUTH_DOMAIN + value: auth.meet.jitsi + - name: XMPP_INTERNAL_MUC_DOMAIN + value: internal-muc.meet.jitsi + - name: XMPP_BOSH_URL_BASE + value: http://127.0.0.1:5280 + - name: XMPP_MUC_DOMAIN + value: muc.meet.jitsi + - name: TZ + value: America/Los_Angeles + - name: JVB_TCP_HARVESTER_DISABLED + value: "true" + - name: jvb + image: jitsi/jvb + imagePullPolicy: Always + env: + - name: XMPP_SERVER + value: localhost + - name: DOCKER_HOST_ADDRESS + value: + - name: XMPP_DOMAIN + value: meet.jitsi + - name: XMPP_AUTH_DOMAIN + value: auth.meet.jitsi + - name: XMPP_INTERNAL_MUC_DOMAIN + value: internal-muc.meet.jitsi + - name: JVB_STUN_SERVERS + value: stun.l.google.com:19302,stun1.l.google.com:19302,stun2.l.google.com:19302 + - name: JICOFO_AUTH_USER + value: focus + - name: JVB_TCP_HARVESTER_DISABLED + value: "true" + - name: JVB_AUTH_USER + value: jvb + - name: JVB_PORT + value: "30300" + - name: JVB_AUTH_PASSWORD + valueFrom: + secretKeyRef: + name: jitsi-config + key: JVB_AUTH_PASSWORD + - name: JICOFO_AUTH_PASSWORD + valueFrom: + secretKeyRef: + name: jitsi-config + key: JICOFO_AUTH_PASSWORD + - name: JVB_BREWERY_MUC + value: jvbbrewery + - name: TZ + value: America/Los_Angeles diff --git a/examples/kubernetes/jvb-service.yaml b/examples/kubernetes/jvb-service.yaml new file mode 100644 index 0000000..6cf1434 --- /dev/null +++ b/examples/kubernetes/jvb-service.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + service: jvb + name: jvb-udp + namespace: jitsi +spec: + type: NodePort + externalTrafficPolicy: Cluster + ports: + - port: 30300 + protocol: UDP + targetPort: 30300 + nodePort: 30300 + selector: + k8s-app: jitsi diff --git a/examples/kubernetes/web-service.yaml b/examples/kubernetes/web-service.yaml new file mode 100644 index 0000000..37b07bc --- /dev/null +++ b/examples/kubernetes/web-service.yaml @@ -0,0 +1,32 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + service: web + name: web + namespace: jitsi +spec: + ports: + - name: "http" + port: 80 + targetPort: 80 + - name: "https" + port: 443 + targetPort: 443 + selector: + k8s-app: jitsi +--- + apiVersion: networking.k8s.io/v1beta1 + kind: Ingress + metadata: + name: jitsi + namespace: jitsi + spec: + rules: + - host: ... + http: + paths: + - path: / + backend: + serviceName: web + servicePort: https \ No newline at end of file From cc2c0424dd7f567506b27e9f0f321ff62a4fe763 Mon Sep 17 00:00:00 2001 From: Paul Tiedtke Date: Sun, 16 Feb 2020 07:11:37 +0100 Subject: [PATCH 06/11] prosody: fix restart loop on rolling deployment --- prosody/rootfs/defaults/prosody.cfg.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prosody/rootfs/defaults/prosody.cfg.lua b/prosody/rootfs/defaults/prosody.cfg.lua index eb1038f..2e9d6a3 100644 --- a/prosody/rootfs/defaults/prosody.cfg.lua +++ b/prosody/rootfs/defaults/prosody.cfg.lua @@ -93,7 +93,7 @@ allow_registration = false; daemonize = false; -pidfile = "/config/data/prosody.pid"; +pidfile = "/tmp/prosody.pid"; -- Force clients to use encrypted connections? This option will -- prevent clients from authenticating unless they are using encryption. From 01eca7423e327b4f15279da80311ae0d078d1011 Mon Sep 17 00:00:00 2001 From: Paul Tiedtke Date: Tue, 18 Feb 2020 19:50:38 +0100 Subject: [PATCH 07/11] jigasi: generate google cloud credentials from env vars --- README.md | 9 ++++++-- env.example | 14 +++++++----- jigasi.yml | 7 +++++- jigasi/Dockerfile | 4 +++- jigasi/rootfs/etc/cont-init.d/10-config | 29 +++++++++++++++++++++++++ 5 files changed, 54 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index f8881d9..690c83d 100644 --- a/README.md +++ b/README.md @@ -340,9 +340,14 @@ If you want to enable the Transcribing function, these options are required: Variable | Description | Example --- | --- | --- `ENABLE_TRANSCRIPTIONS` | Enable Jigasi transcription in a conference | 1 -`GOOGLE_APPLICATION_CREDENTIALS` | Credentials for connect to Cloud Google API from Jigasi. Path located inside the container | /config/key.json +`GC_PROJECT_ID` | `project_id` from Google Cloud Credetials +`GC_PRIVATE_KEY_ID` | `private_key_id` from Google Cloud Credetials +`GC_PRIVATE_KEY` | `private_key` from Google Cloud Credetials +`GC_CLIENT_EMAIL` | `client_email` from Google Cloud Credetials +`GC_CLIENT_ID` | `client_id` from Google Cloud Credetials +`GC_CLIENT_CERT_URL` | `client_x509_cert_url` from Google Cloud Credetials -For setting `GOOGLE_APPLICATION_CREDENTIALS` please read https://cloud.google.com/text-to-speech/docs/quickstart-protocol section "Before you begin" from 1 to 5 paragraph. +For setting the Google Cloud Credentials please read https://cloud.google.com/text-to-speech/docs/quickstart-protocol section "Before you begin" from 1 to 5 paragraph. ### Advanced configuration diff --git a/env.example b/env.example index bea835f..d7af5f9 100644 --- a/env.example +++ b/env.example @@ -243,11 +243,15 @@ JIGASI_PORT_MAX=20050 # Jigasi post to the chat an url with transcription file. Default false. #JIGASI_TRANSCRIBER_ADVERTISE_URL=true -# Credentials for connect to Cloud Google API from Jigasi. Path located inside the container. -# Please read https://cloud.google.com/text-to-speech/docs/quickstart-protocol -# section "Before you begin" from 1 to 5 paragraph. Copy the key on -# the docker host to ${CONFIG}/jigasi/key.json and to enable this setting: -#GOOGLE_APPLICATION_CREDENTIALS=/config/key.json +# Credentials for connect to Cloud Google API from Jigasi +# Please read https://cloud.google.com/text-to-speech/docs/quickstart-protocol section "Before you begin" from 1 to 5 paragraph. +# Copy the values from the json to the related env vars +#GC_PROJECT_ID= +#GC_PRIVATE_KEY_ID= +#GC_PRIVATE_KEY= +#GC_CLIENT_EMAIL= +#GC_CLIENT_ID= +#GC_CLIENT_CERT_URL= # Enable recording #ENABLE_RECORDING=1 diff --git a/jigasi.yml b/jigasi.yml index 46f1584..600ef84 100644 --- a/jigasi.yml +++ b/jigasi.yml @@ -34,7 +34,12 @@ services: - JIGASI_TRANSCRIBER_ADVERTISE_URL - JIGASI_TRANSCRIBER_RECORD_AUDIO - JIGASI_TRANSCRIBER_SEND_TXT - - GOOGLE_APPLICATION_CREDENTIALS + - GC_PROJECT_ID + - GC_PRIVATE_KEY_ID + - GC_PRIVATE_KEY + - GC_CLIENT_EMAIL + - GC_CLIENT_ID + - GC_CLIENT_CERT_URL - TZ depends_on: - prosody diff --git a/jigasi/Dockerfile b/jigasi/Dockerfile index 482fb06..7caca45 100644 --- a/jigasi/Dockerfile +++ b/jigasi/Dockerfile @@ -1,9 +1,11 @@ ARG JITSI_REPO=jitsi FROM ${JITSI_REPO}/base-java +ENV GOOGLE_APPLICATION_CREDENTIALS /config/key.json + RUN \ apt-dpkg-wrap apt-get update && \ - apt-dpkg-wrap apt-get install -y jigasi && \ + apt-dpkg-wrap apt-get install -y jigasi jq && \ apt-cleanup COPY rootfs/ / diff --git a/jigasi/rootfs/etc/cont-init.d/10-config b/jigasi/rootfs/etc/cont-init.d/10-config index bf9d0c6..e34f1a2 100644 --- a/jigasi/rootfs/etc/cont-init.d/10-config +++ b/jigasi/rootfs/etc/cont-init.d/10-config @@ -10,3 +10,32 @@ fi mkdir -pm777 /tmp/transcripts chown jigasi:jitsi /tmp/transcripts + +# Create Google Cloud Credentials +if [[ $ENABLE_TRANSCRIPTIONS -eq 1 || $ENABLE_TRANSCRIPTIONS == "true" ]] && [[ ! -f /config/key.json ]]; then + if [[ -z $GC_PROJECT_ID || -z $GC_PRIVATE_KEY_ID || -z $GC_PRIVATE_KEY || -z $GC_CLIENT_EMAIL || -z $GC_CLIENT_ID || -z $GC_CLIENT_CERT_URL ]]; then + echo 'Transcriptions: One or more environment variables are undefined' + exit 1 + fi + + jq -n \ + --arg GC_PROJECT_ID "$GC_PROJECT_ID" \ + --arg GC_PRIVATE_KEY_ID "$GC_PRIVATE_KEY_ID" \ + --arg GC_PRIVATE_KEY "$GC_PRIVATE_KEY" \ + --arg GC_CLIENT_EMAIL "$GC_CLIENT_EMAIL" \ + --arg GC_CLIENT_ID "$GC_CLIENT_ID" \ + --arg GC_CLIENT_CERT_URL "$GC_CLIENT_CERT_URL" \ + '{ + type: "service_account", + project_id: $GC_PROJECT_ID, + private_key_id: $GC_PRIVATE_KEY_ID, + private_key: $GC_PRIVATE_KEY, + client_email: $GC_CLIENT_EMAIL, + client_id: $GC_CLIENT_ID, + auth_uri: "https://accounts.google.com/o/oauth2/auth", + token_uri: "https://oauth2.googleapis.com/token", + auth_provider_x509_cert_url: "https://www.googleapis.com/oauth2/v1/certs", + client_x509_cert_url: $GC_CLIENT_CERT_URL + }' \ + > /config/key.json +fi From 986071b100fa5a60348e6e8b749f33c8c779ffe6 Mon Sep 17 00:00:00 2001 From: Paul Tiedtke Date: Tue, 18 Feb 2020 19:52:49 +0100 Subject: [PATCH 08/11] jigasi: add missing transcription volumes to dockerfile --- jigasi/Dockerfile | 2 +- web/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jigasi/Dockerfile b/jigasi/Dockerfile index 7caca45..8d50fac 100644 --- a/jigasi/Dockerfile +++ b/jigasi/Dockerfile @@ -10,4 +10,4 @@ RUN \ COPY rootfs/ / -VOLUME /config +VOLUME ["/config", "/tmp/transcripts"] diff --git a/web/Dockerfile b/web/Dockerfile index 6d06268..7e6fbae 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -13,4 +13,4 @@ COPY rootfs/ / EXPOSE 80 443 -VOLUME ["/config", "/etc/letsencrypt"] +VOLUME ["/config", "/etc/letsencrypt", "/usr/share/jitsi-meet/transcripts"] From a1df1e052bf7b5fbbf38dc93cb7af52a799bf5b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Fri, 21 Feb 2020 17:27:55 +0100 Subject: [PATCH 09/11] Revert "prosody: fix restart loop on rolling deployment" This reverts commit cc2c0424dd7f567506b27e9f0f321ff62a4fe763. --- prosody/rootfs/defaults/prosody.cfg.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prosody/rootfs/defaults/prosody.cfg.lua b/prosody/rootfs/defaults/prosody.cfg.lua index 2e9d6a3..eb1038f 100644 --- a/prosody/rootfs/defaults/prosody.cfg.lua +++ b/prosody/rootfs/defaults/prosody.cfg.lua @@ -93,7 +93,7 @@ allow_registration = false; daemonize = false; -pidfile = "/tmp/prosody.pid"; +pidfile = "/config/data/prosody.pid"; -- Force clients to use encrypted connections? This option will -- prevent clients from authenticating unless they are using encryption. From 0a68be16af95202c2aaa27c62cee399fbaeb070b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Mon, 23 Mar 2020 19:54:23 +0100 Subject: [PATCH 10/11] jibri: start once jicofo has started --- jibri.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jibri.yml b/jibri.yml index 2f5a3e7..324f613 100644 --- a/jibri.yml +++ b/jibri.yml @@ -28,6 +28,8 @@ services: - JIBRI_LOGS_DIR - DISPLAY=:0 - TZ + depends_on: + - jicofo networks: meet.jitsi: From f4ac7cc3523a4ac4f2d6f120d40df400d5248092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Mon, 23 Mar 2020 19:59:47 +0100 Subject: [PATCH 11/11] misc: remove bogus quotation marks --- env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env.example b/env.example index d7af5f9..9d0d9a5 100644 --- a/env.example +++ b/env.example @@ -15,7 +15,7 @@ HTTPS_PORT=8443 TZ=Europe/Amsterdam # Public URL for the web service. -#PUBLIC_URL="https://meet.example.com" +#PUBLIC_URL=https://meet.example.com # IP address of the Docker host. See the "Running on a LAN environment" section # in the README.