Introduce bbb_config_webrtc_sfu_* and use it to configure livekit dialin.

Dial-in does not actually work, this is just for preparation once it is ready to use upstream.

Author: defnull

README.md

@@ -425,6 +425,9 @@ This role generates configuration with sensible defaults out of the box and cove
 * **`bbb_config_presentation`** (default: `{}`)\
   Custom overrides for `/etc/bigbluebutton/recording/presentation.yml`. This will be deep-merged into the role-managed configuration. List values will not be merged, but replaced.
 
+* **`bbb_config_webrtc_sfu`** (default: `{}`)\
+  Custom overrides for `/etc/bigbluebutton/bbb-webrtc-sfu/production.yml`. This will be deep-merged into the role-managed configuration. List values will not be merged, but replaced.
+
 
 ### Other stuff not full migrated to BBB 3.0 yet.
 

defaults/main.yml

@@ -91,6 +91,7 @@ bbb_config_web: {} # bbb-web.properties
 bbb_config_html5: {} # bbb-html5.yml
 bbb_config_etherpad: {} # etherpad.json
 bbb_config_presentation: {} # recording/presentation.yml
+bbb_config_webrtc_sfu: {} # bbb-webrtc-sfu/production.yml
 
 ### STUN/TURN Servers
 

tasks/configure-freeswitch.yml

@@ -92,7 +92,7 @@
     owner: freeswitch
     group: daemon
     mode: "0600"
-  with_items:
+  loop:
     - /opt/freeswitch/etc/freeswitch/vars.xml
     - /opt/freeswitch/etc/freeswitch/autoload_configs/event_socket.conf.xml
 
@@ -168,7 +168,7 @@
 
 - name: Deploy dial-in config files
   become: true
-  when: bbb_dialin_enable
+  when: bbb_dialin_enable and not bbb_livekit_enable
   ansible.builtin.template:
     src: "dial-in/{{ item.src }}.j2"
     dest: "/opt/freeswitch/conf/{{ item.dest }}"
@@ -184,7 +184,7 @@
 
 - name: Remove unused dial-in config files
   become: true
-  when: not bbb_dialin_enable
+  when: not bbb_dialin_enable or bbb_livekit_enable
   ansible.builtin.file:
     path: "/opt/freeswitch/conf/{{ item.dest }}"
     state: absent

tasks/configure-livekit.yml

@@ -1,8 +1,19 @@
 ---
+# https://github.com/bigbluebutton/bigbluebutton/issues/23247
 - name: Ensure livekit-sip service state
   when: bbb_livekit_enable
   become: true
   ansible.builtin.service:
     name: livekit-sip
     enabled: "{{ bbb_dialin_enable }}"
     state: "{{ bbb_dialin_enable | ternary('started', 'stopped') }}"
+
+- name: Stop freeswitch if livekit is used
+  become: true
+  ansible.builtin.service:
+    name: "{{ item }}"
+    enabled: "{{ not bbb_livekit_enable }}"
+    state: "{{ bbb_livekit_enable | ternary('stopped', 'started') }}"
+  loop:
+    - freeswitch
+

tasks/mixin-livekit.yml

@@ -1,25 +1,63 @@
 ---
-- when: bbb_livekit_enable
-  block:
-    - name: Update bbb-web for livekit
-      ansible.builtin.set_fact:
-        bbb_config_web_base: |
-          {{bbb_config_web_base | combine({
-            "audioBridge": "livekit",
-            "cameraBridge": "livekit",
-            "screenShareBridge": "livekit"
-          })}}
+- name: Update base configuration for livekit
+  when: bbb_livekit_enable
+  ansible.builtin.set_fact:
+    bbb_config_web_base: |
+      {{bbb_config_web_base | combine({
+        "audioBridge": "livekit",
+        "cameraBridge": "livekit",
+        "screenShareBridge": "livekit"
+      })}}
+    bbb_config_webrtc_sfu_base: |
+      {{bbb_config_webrtc_sfu_base | combine({
+        "livekit": {
+          "enabled": True,
+          "key": bbb_livekit_api_key,
+          "secret": bbb_livekit_api_secret,
+        }
+      })}}
 
-    - name: Update html5 for livekit
-      when: bbb_cluster_proxy is defined
-      ansible.builtin.set_fact:
-        bbb_config_html5_base: |
-          {{bbb_config_html5_base | combine({
-            'public': {
-              'media': {
-                'livekit': {
-                  'url': 'wss://'+bbb_hostname+'/livekit'
-                }
-              }
+- name: Update html5 config for livekit with proxy mode
+  when: bbb_livekit_enable and bbb_cluster_proxy is defined
+  ansible.builtin.set_fact:
+    bbb_config_html5_base: |
+      {{bbb_config_html5_base | combine({
+        'public': {
+          'media': {
+            'livekit': {
+              'url': 'wss://'+bbb_hostname+'/livekit'
             }
-          }, recursive=True)}}
+          }
+        }
+      }, recursive=True)}}
+
+# TODO: Does not work yet!
+- name: Update webrtc-sfu for livekit with dialin
+  when: bbb_livekit_enable and bbb_dialin_enable
+  ansible.builtin.set_fact:
+    bbb_config_webrtc_sfu_base: |
+      {{bbb_config_webrtc_sfu_base | combine(_bbb_config_webrtc_sfu_patch, recursive=True)}}
+  vars:
+    _bbb_config_webrtc_sfu_patch: 
+      livekit:
+        rtcAgent:
+          enabled: true
+        sip:
+          enabled: true
+          requirePin: true
+          trunk:
+            # See https://docs.livekit.io/server-sdk-js/interfaces/CreateSipInboundTrunkOptions.html
+            options:
+              allowedAddresses: 
+                - "{{ bbb_dialin_provider }}"
+              allowedNumbers:
+                - "{{ bbb_dialin_provider_extension }}"
+              authUsername: "{{ bbb_dialin_provider_username }}"
+              authPassword: "{{ bbb_dialin_provider_password }}"
+          dispatch:
+            # See https://docs.livekit.io/reference/server-sdk-js/interfaces/CreateSipDispatchRuleOptions.html
+            options:
+              #attributes: {}
+              hidePhoneNumber: "{{ bbb_dialin_mask_caller }}"
+              #roomConfig: {}
+              #roomPreset: 'default'

templates/bbb-config/bigbluebutton/bbb-webrtc-sfu/production.yml.j2

@@ -1,22 +1,2 @@
----
-# {{ansible_managed}}
-freeswitch:
-  ip: "{{ bbb_public_ip4 }}"
-  sip_ip: "127.0.0.1"
-  esl_ip: "127.0.0.1"
-  esl_password: "{{ bbb_freeswitch_socket_password }}"
-mediasoup:
-  webrtc:
-    listenIps:
-      - ip: "{{ bbb_bind_ip4 }}"
-        announcedIp: "{{ bbb_public_ip4 }}"
-  plainRtp:
-    listenIp:
-      ip: "{{ bbb_bind_ip4 }}"
-      announcedIp: "{{ bbb_public_ip4 }}"
-{% if bbb_livekit_enable %}
-livekit:
-  key: {{ bbb_livekit_api_key }}
-  secret: {{ bbb_livekit_api_secret }}
-  enabled: true
-{% endif %}
+# {{ansible_managed}} 
+{{ {} | combine(bbb_config_webrtc_sfu_base, bbb_config_webrtc_sfu, recursive=True) | to_nice_yaml}}

vars/main.yml

@@ -172,6 +172,22 @@ bbb_config_html5_base:
     pads:
       url: "https://{{ bbb_hostname }}/pad"
 
+bbb_config_webrtc_sfu_base:
+  freeswitch:
+    ip: "{{ bbb_public_ip4 }}"
+    sip_ip: "127.0.0.1"
+    esl_ip: "127.0.0.1"
+    esl_password: "{{ bbb_freeswitch_socket_password }}"
+  mediasoup:
+    webrtc:
+      listenIps:
+        - ip: "{{ bbb_bind_ip4 }}"
+          announcedIp: "{{ bbb_public_ip4 }}"
+    plainRtp:
+      listenIp:
+        ip: "{{ bbb_bind_ip4 }}"
+        announcedIp: "{{ bbb_public_ip4 }}"
+
 bbb_config_etherpad_base: {}
 bbb_nginx_root: /var/www/bigbluebutton-default/assets
 bbb_host_seed: "{{ (bbb_hostname + bbb_secret_seed) | hash('sha256') }}"