From 7559933717b8a50b90f085a05ecc67d87dd9aa2a Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Mon, 19 Dec 2022 01:00:28 +0100
Subject: [PATCH] Update to 2022-12-19 01:00

---
 roles/jitsi/tasks/conf.yml                    |  1 -
 roles/jitsi/templates/jicofo/jicofo.conf.j2   | 38 +++++++++++++++----
 .../jicofo/sip-communicator.properties.j2     | 11 ------
 roles/jitsi/templates/jitsi-jicofo.service.j2 |  8 +---
 4 files changed, 32 insertions(+), 26 deletions(-)
 delete mode 100644 roles/jitsi/templates/jicofo/sip-communicator.properties.j2

diff --git a/roles/jitsi/tasks/conf.yml b/roles/jitsi/tasks/conf.yml
index 9a20acf..7f65687 100644
--- a/roles/jitsi/tasks/conf.yml
+++ b/roles/jitsi/tasks/conf.yml
@@ -36,7 +36,6 @@
   template: src=jicofo/{{ item }}.j2 dest={{ jitsi_root_dir }}/etc/jicofo/{{ item }} group={{ jitsi_user }} mode=640
   loop:
     - jicofo.conf
-    - sip-communicator.properties
   notify: restart jitsi-jicofo
   tags: jitsi
 
diff --git a/roles/jitsi/templates/jicofo/jicofo.conf.j2 b/roles/jitsi/templates/jicofo/jicofo.conf.j2
index 2796f80..b523e7b 100644
--- a/roles/jitsi/templates/jicofo/jicofo.conf.j2
+++ b/roles/jitsi/templates/jicofo/jicofo.conf.j2
@@ -1,8 +1,32 @@
 # {{ ansible_managed }}
-JICOFO_HOST={{ jitsi_xmpp_server }}
-JICOFO_DOMAIN={{ jitsi_domain }}
-JICOFO_USER={{ jitsi_jicofo_xmpp_user }}
-JICOFO_USERDOMAIN={{ jitsi_auth_domain }}
-JICOFO_USER_PASS='{{ jitsi_jicofo_xmpp_pass }}'
-JICOFO_OPTS=''
-JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION={{ jitsi_root_dir }}/etc -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo"
+jicofo {
+
+  authentication {
+    enabled = {{ (jitsi_auth == 'sso' or jitsi_auth == 'ldap') | ternary('true', 'false') }}
+    type = {{ (jitsi_auth == 'ldap') | ternary('XMPP', 'SHIBBOLETH') }}
+  }
+
+  bridge {
+    brewery-jid = "JvbBrewery@internal.{{ jitsi_auth_domain }}"
+  }
+
+  jibri {
+    brewery-jid = "JibriBrewery@internal.{{ jitsi_auth_domain }}"
+  }
+
+{% if jitsi_jigasi %}
+  jigasi {
+    brewery-jid = "JigasiBrewery@internal.{{ jitsi_auth_domain }}"
+  }
+{% endif %}
+
+  xmpp {
+    client {
+      domain = {{ jitsi_auth_domain }}
+      xmpp-domain = {{ jitsi_domain }}
+      username = {{ jitsi_jicofo_xmpp_user }}
+      password = "{{ jitsi_jicofo_xmpp_pass }}"
+      client-proxy = focus.{{ jitsi_domain }}
+    }
+  }
+}
diff --git a/roles/jitsi/templates/jicofo/sip-communicator.properties.j2 b/roles/jitsi/templates/jicofo/sip-communicator.properties.j2
deleted file mode 100644
index 408f75e..0000000
--- a/roles/jitsi/templates/jicofo/sip-communicator.properties.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-{% if jitsi_auth == 'sso' %}
-org.jitsi.jicofo.auth.URL=shibboleth:default
-{% elif jitsi_auth == 'ldap' %}
-org.jitsi.jicofo.auth.URL=XMPP:{{ jitsi_domain }}
-{% endif %}
-org.jitsi.jicofo.BRIDGE_MUC=JvbBrewery@internal.{{ jitsi_auth_domain }}
-{% if jitsi_jigasi %}
-org.jitsi.jicofo.jigasi.BREWERY=JigasiBrewery@internal.{{ jitsi_auth_domain }}
-{% endif %}
-org.jitsi.jicofo.jibri.BREWERY=JibriBrewery@internal.{{ jitsi_auth_domain }}
-org.jitsi.jicofo.jibri.PENDING_TIMEOUT=90
diff --git a/roles/jitsi/templates/jitsi-jicofo.service.j2 b/roles/jitsi/templates/jitsi-jicofo.service.j2
index eb8c966..48e8f49 100644
--- a/roles/jitsi/templates/jitsi-jicofo.service.j2
+++ b/roles/jitsi/templates/jitsi-jicofo.service.j2
@@ -5,7 +5,6 @@ After=network.target
 [Service]
 Type=simple
 SuccessExitStatus=143
-EnvironmentFile={{ jitsi_root_dir }}/etc/jicofo/jicofo.conf
 User={{ jitsi_user }}
 Group={{ jitsi_user }}
 PrivateTmp=true
@@ -16,13 +15,8 @@ ReadOnlyDirectories={{ jitsi_root_dir }}/etc {{ jitsi_root_dir }}/jicofo
 Restart=on-failure
 StartLimitInterval=0
 RestartSec=30
+Environment=JAVA_SYS_PROPS=-Dconfig.file={{ jitsi_root_dir }}/etc/jicofo/jicofo.conf
 ExecStart=/opt/jitsi/jicofo/jicofo.sh \
-            --host=${JICOFO_HOST} \
-            --domain=${JICOFO_DOMAIN} \
-            --secret=${JICOFO_SECRET} \
-            --user_domain=${JICOFO_USERDOMAIN} \
-            --user_name=${JICOFO_USER} \
-            --user_password=${JICOFO_USER_PASS} \
             ${JICOFO_OPT}
 SyslogIdentifier=jicofo