Adjusted variables and docker-compose file to account for multitenancy setups.

templates/docker-compose.jitsi.yml.j2

@@ -38,20 +38,20 @@ services:
         labels:
               - "traefik.enable=true"
               - "traefik.docker.network=traefik_public"
-              - "traefik.http.routers.jitsi.rule=Host(`{{ jitsi_virtual_host }}`)"
-              - "traefik.http.routers.jitsi.entrypoints=websecure"
-              - "traefik.http.routers.jitsi.tls=true"
-              - "traefik.http.routers.jitsi.tls.certresolver=defaultresolver"
-              - "traefik.http.middlewares.jitsi-headers.headers.SSLRedirect=true"
-              - "traefik.http.middlewares.jitsi-headers.headers.browserXSSFilter=true"
-              - "traefik.http.middlewares.jitsi-headers.headers.contentTypeNosniff=true"
-              - "traefik.http.middlewares.jitsi-headers.headers.forceSTSHeader=true"
-              - "traefik.http.middlewares.jitsi-headers.headers.STSSeconds=315360000"
-              - "traefik.http.middlewares.jitsi-headers.headers.STSIncludeSubdomains=true"
-              - "traefik.http.middlewares.jitsi-headers.headers.STSPreload=true"
-              - "traefik.http.middlewares.jitsi-headers.headers.featurePolicy=geolocation 'none'; payment 'none'"
-              - "traefik.http.middlewares.jitsi-headers.headers.contentSecurityPolicy=default-src 'self'; img-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; font-src 'self'; object-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'none'; block-all-mixed-content"
-              - "traefik.http.routers.jitsi.middlewares=jitsi-headers"
+              - "traefik.http.routers.jitsi{{ jitsi_multitenant_postfix }}.rule=Host(`{{ jitsi_virtual_host }}`)"
+              - "traefik.http.routers.jitsi{{ jitsi_multitenant_postfix }}.entrypoints=websecure"
+              - "traefik.http.routers.jitsi{{ jitsi_multitenant_postfix }}.tls=true"
+              - "traefik.http.routers.jitsi{{ jitsi_multitenant_postfix }}.tls.certresolver=defaultresolver"
+              - "traefik.http.middlewares.jitsi{{ jitsi_multitenant_postfix }}-headers.headers.SSLRedirect=true"
+              - "traefik.http.middlewares.jitsi{{ jitsi_multitenant_postfix }}-headers.headers.browserXSSFilter=true"
+              - "traefik.http.middlewares.jitsi{{ jitsi_multitenant_postfix }}-headers.headers.contentTypeNosniff=true"
+              - "traefik.http.middlewares.jitsi{{ jitsi_multitenant_postfix }}-headers.headers.forceSTSHeader=true"
+              - "traefik.http.middlewares.jitsi{{ jitsi_multitenant_postfix }}-headers.headers.STSSeconds=315360000"
+              - "traefik.http.middlewares.jitsi{{ jitsi_multitenant_postfix }}-headers.headers.STSIncludeSubdomains=true"
+              - "traefik.http.middlewares.jitsi{{ jitsi_multitenant_postfix }}-headers.headers.STSPreload=true"
+              - "traefik.http.middlewares.jitsi{{ jitsi_multitenant_postfix }}-headers.headers.featurePolicy=geolocation 'none'; payment 'none'"
+              - "traefik.http.middlewares.jitsi{{ jitsi_multitenant_postfix }}-headers.headers.contentSecurityPolicy=default-src 'self'; img-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; font-src 'self'; object-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'none'; block-all-mixed-content"
+              - "traefik.http.routers.jitsi{{ jitsi_multitenant_postfix }}.middlewares=jitsi{{ jitsi_multitenant_postfix }}-headers"
         networks:
             public:
             meet.jitsi:

templates/env.jitsi.j2

@@ -1,3 +1,9 @@
+#
+# Docker Compose configuration
+#
+# Project name for this Docker Compose setup
+COMPOSE_PROJECT_NAME=jitsi{{ jitsi_multitenant_postfix }}
+
 #
 # Basic configuration options
 #
@@ -187,11 +193,11 @@ JVB_AUTH_PASSWORD={{ jitsi_jvb_auth_password }}
 JVB_STUN_SERVERS={{ jitsi_jvb_stun_servers }}
 
 # Media port for the Jitsi Videobridge
-JVB_PORT=10000
+JVB_PORT={{ jitsi_bridge_udp_port }}
 
 # TCP Fallback for Jitsi Videobridge for when UDP isn't available
 JVB_TCP_HARVESTER_DISABLED=true
-JVB_TCP_PORT=4443
+JVB_TCP_PORT={{ jitsi_bridge_tcp_port }}
 
 # A comma separated list of APIs to enable when the JVB is started. The default is none.
 # See https://github.com/jitsi/jitsi-videobridge/blob/master/doc/rest.md for more information

templates/etherpad.yml

@@ -4,6 +4,7 @@ services:
     # Etherpad: real-time collaborative document editing
     etherpad:
         image: jitsi/etherpad
+        restart: unless-stopped
         networks:
             meet.jitsi:
                 aliases:

templates/jibri.yml

@@ -3,6 +3,7 @@ version: '3'
 services:
     jibri:
         image: jitsi/jibri
+        restart: unless-stopped
         volumes:
             - ${CONFIG}/jibri:/config
             - /dev/shm:/dev/shm

templates/jigasi.yml

@@ -4,6 +4,7 @@ services:
     # SIP gateway (audio)
     jigasi:
         image: jitsi/jigasi
+        restart: unless-stopped
         ports:
             - '${JIGASI_PORT_MIN}-${JIGASI_PORT_MAX}:${JIGASI_PORT_MIN}-${JIGASI_PORT_MAX}/udp'
         volumes: