feat(bbb-docker): Add enable switches for **Collabora** and **Coturn** + make Collabora URL configurable

docker-compose.tmpl.yml

@@ -35,7 +35,9 @@ services:
         - redis
         - etherpad
         - bbb-pads
+        {{ if isTrue .Env.ENABLE_COLLABORA }}
         - collabora
+        {{ end }}
     healthcheck:
       test: wget --no-proxy --no-verbose --tries=1 --spider http://10.7.7.2:8090/bigbluebutton/api || exit 1
       start_period: 2m
@@ -52,6 +54,7 @@ services:
       TURN_EXT_SERVER: ${TURN_EXT_SERVER:-}
       TURN_EXT_SECRET: ${TURN_EXT_SECRET:-}
       ENABLE_LEARNING_DASHBOARD: ${ENABLE_LEARNING_DASHBOARD:-true}
+      COLLABORA_URL: ${COLLABORA_URL:-https://collabora:9980/cool}
     volumes:
       - ./data/bigbluebutton:/var/bigbluebutton
       - ./data/freeswitch-meetings:/var/freeswitch/meetings
@@ -150,9 +153,12 @@ services:
     restart: unless-stopped
     depends_on:
       - redis
+      {{ if isTrue .Env.ENABLE_COLLABORA }}
       - collabora
+      {{ end }}
     environment:
       ETHERPAD_API_KEY: ${ETHERPAD_API_KEY}
+      COLLABORA_URL:    ${COLLABORA_URL:-https://collabora:9980/cool}
     networks:
       bbb-net:
         ipv4_address: 10.7.7.4
@@ -366,6 +372,7 @@ services:
       - ./.cache/go-build:/.cache/go-build:rw
     {{ end }}
 
+{{ if isTrue .Env.ENABLE_COLLABORA }}
   collabora:
     image: collabora/code:latest
     restart: unless-stopped
@@ -377,7 +384,7 @@ services:
     # disable logging (way to verbose)
     logging:
       driver: none
-
+{{ end }}
 
   periodic:
     build: mod/periodic
@@ -482,6 +489,7 @@ services:
     network_mode: host
 {{end}}
 
+{{ if isTrue .Env.ENABLE_COTURN }}
   # coturn
   coturn:
     image: coturn/coturn:4.6-alpine
@@ -496,7 +504,7 @@ services:
     volumes:
       - ./mod/coturn/turnserver.conf:/etc/coturn/turnserver.conf
     network_mode: host
-
+{{end}}
 
 {{ if isTrue .Env.ENABLE_GREENLIGHT }}
   # greenlight

mod/bbb-web/office-convert.sh

@@ -31,6 +31,6 @@ timeoutSecs="${timeoutSecs:0:3}"
 
 # The timeout is important.
 
-timeout $(printf %03d $timeoutSecs)s curl -F "data=@${source}" -k https://collabora:9980/cool/convert-to/$convertTo > "${dest}"
+timeout $(printf %03d $timeoutSecs)s curl -F "data=@${source}" -k $COLLABORA_URL/convert-to/$convertTo > "${dest}"
 
 exit 0

mod/etherpad/etherpad-export.sh

@@ -4,6 +4,6 @@ dest="$(echo $8 | sed -E -e 's/html|odt/'$7'/')"
 convertTo="$7"
 
 
-curl -v -F "data=@${src}" -k https://collabora:9980/cool/convert-to/$convertTo > "${dest}"
+curl -v -F "data=@${src}" -k $COLLABORA_URL/convert-to/$convertTo > "${dest}"
 
 exit 0

sample.env

@@ -12,6 +12,20 @@ LETSENCRYPT_EMAIL=test@example.net
 # https://docs.bigbluebutton.org/greenlight/gl-overview.html
 ENABLE_GREENLIGHT=true
 
+
+# Collabora
+# Enable Collabora service
+# Deactivate if you use an external coturn server
+# https://www.collaboraonline.com/
+ENABLE_COLLABORA=true
+COLLABORA_URL=https://collabora:9980/cool
+
+# Coturn
+# Enable Coturn service
+# Deactivate if you use an external coturn server
+# https://github.com/coturn/coturn
+ENABLE_COTURN=true
+
 # Enable Webhooks
 # used by some integrations
 #ENABLE_WEBHOOKS=true

scripts/generate-compose

@@ -59,6 +59,8 @@ docker run  \
     -e ENABLE_HTTPS_PROXY=${ENABLE_HTTPS_PROXY:-false} \
     -e ENABLE_WEBHOOKS=${ENABLE_WEBHOOKS:-false} \
     -e ENABLE_GREENLIGHT=${ENABLE_GREENLIGHT:-false} \
+    -e ENABLE_COTURN=${ENABLE_COTURN:-true} \
+    -e ENABLE_COLLABORA=${ENABLE_COLLABORA:-true} \
     -e ENABLE_PROMETHEUS_EXPORTER=${ENABLE_PROMETHEUS_EXPORTER:-false} \
     -e ENABLE_PROMETHEUS_EXPORTER_OPTIMIZATION=${ENABLE_PROMETHEUS_EXPORTER_OPTIMIZATION:-false} \
     jwilder/dockerize -template /docker-compose.tmpl.yml \