From dbf96fa6b288fe2433bad53a3080436ef9576fff Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Wed, 28 Dec 2022 14:00:13 +0100
Subject: [PATCH] Update to 2022-12-28 14:00

---
 roles/jitsi/defaults/main.yml    | 200 +++++++++++++------------------
 roles/jitsi/templates/meet.js.j2 |  19 +++
 2 files changed, 101 insertions(+), 118 deletions(-)

diff --git a/roles/jitsi/defaults/main.yml b/roles/jitsi/defaults/main.yml
index 9e18856..25ed552 100644
--- a/roles/jitsi/defaults/main.yml
+++ b/roles/jitsi/defaults/main.yml
@@ -71,77 +71,47 @@ jitsi_meet_conf_base:
   websocket: wss://{{ jitsi_domain }}/xmpp-websocket
   clientNode: http://jitsi.org/jitsimeet
   focusUserJid: "{{ jitsi_jicofo_xmpp_user }}@{{ jitsi_auth_domain }}"
-  disableSimulcast: False
-  constraints:
-    video:
-      height:
-        ideal: 720
-        max: 720
-        min: 180
-      width:
-        ideal: 1280
-        max: 1280
-        min: 320
-  disableAudioLevels: True
   enableNoAudioDetection: True
-  enableNoisyMicDetection: False
-  startAudioMuted: 15
-  startVideoMuted: 15
-  enableLayerSuspension: True
-  enableUnifiedOnChrome: True
-  maxFullResolutionParticipants: -1
+  enableNoisyMicDetection: True
+  startAudioMuted: 10
+  startVideoMuted: 10
+  enableOpusRed: True
   desktopSharingFrameRate:
     min: 5
     max: 30
-  disableRtx: False
-  liveStreamingEnabled: False
   channelLastN: 25
-  videoQuality:
-    preferredCodec: 'VP9'
-  maxBitratesVideo:
-    VP8:
-      low: 200000
-      standard: 500000
-      high: 1500000
-    VP9:
-      low: 100000
-      standard: 300000
-      high: 1200000
-  useNewBandwidthAllocationStrategy: True
-  startBitrate: 800
+  #useNewBandwidthAllocationStrategy: True
+  enableUnifiedOnChrome: True
   requireDisplayName: False
-  prejoinPageEnabled: True
+  prejoinConfig:
+    enabled: True
   enableInsecureRoomNameWarning: True
   disableThirdPartyRequests: True
-  enableWelcomePage: True
-  useStunTurn: True
+  welcomePage:
+    disabled: False
   localRecording:
     notifyAllParticipants: True
-    disableSelfRecording: True
   recordingService:
     enabled: "{{ (jitsi_jibri_recordings_base_url is defined) | ternary(True, False) }}"
   p2p:
-    enabled: True
+    enabled: False
     enableUnifiedOnChrome: True
-    preferredCodec: 'VP9'
-    disableH264: True
-    useStunTurn: True
   analytics:
     disabled: True
-  testing:
-    enableThumbnailReordering: True
-    capScreenshareBitrate: 0
   toolbarButtons:
     - camera
     - chat
+    - closedcaptions
     - desktop
+    - download
+    - embedmeeting
     - etherpad
     - fullscreen
     - hangup
+    - highlight
     - invite
     - microphone
-    - mute-everyone
-    - mute-video-everyone
+    - noisesuppression
     - participants-pane
     - profile
     - raisehand
@@ -155,104 +125,98 @@ jitsi_meet_conf_base:
     - tileview
     - toggle-camera
     - videoquality
+    - whiteboard
   dialInNumbersUrl: https://{{ jitsi_domain }}/phoneNumberList
   dialInConfCodeUrl: https://{{ jitsi_domain }}/conferenceMapper
+  screenshotCapture:
+    enabled: True
+  transcription:
+    enabled: False
+  useTurnUdp: True
+  defaultLanguage: fr
+  gravatar:
+    disabled: True
+  giphy:
+    enabled: True
+
 jitsi_meet_conf_extra: {}
 jitsi_meet_conf: "{{ jitsi_meet_conf_base | combine(jitsi_meet_conf_extra, recursive=True) }}"
 
 # Meet interface configuration. Will be converted to JSON
 # See https://github.com/jitsi/jitsi-meet/blob/master/interface_config.js for available settings and their meaning
 jitsi_meet_interface_conf_base:
-  DEFAULT_BACKGROUND: '#474747'
-  DISABLE_VIDEO_BACKGROUND: False
-  INITIAL_TOOLBAR_TIMEOUT: 20000
-  TOOLBAR_TIMEOUT: 4000
-  TOOLBAR_ALWAYS_VISIBLE: False
-  DEFAULT_REMOTE_DISPLAY_NAME: Happy User
-  DEFAULT_LOCAL_DISPLAY_NAME: Me
-  SHOW_JITSI_WATERMARK: False
-  JITSI_WATERMARK_LINK: 'https://jitsi.org'
-  SHOW_BRAND_WATERMARK: False
-  BRAND_WATERMARK_LINK: 'https://www.firewall-services.com'
+  APP_NAME: Jitsi Meet
+  AUDIO_LEVEL_PRIMARY_COLOR: 'rgba(255,255,255,0.4)'
+  AUDIO_LEVEL_SECONDARY_COLOR: 'rgba(255,255,255,0.2)'
+  AUTO_PIN_LATEST_SCREEN_SHARE: remote-only
+  BRAND_WATERMARK_LINK: https://www.ehtrace.com
+  CLOSE_PAGE_GUEST_HINT: False
+  DEFAULT_BACKGROUND: '#040404'
   DEFAULT_WELCOME_PAGE_LOGO_URL: 'images/watermark.svg'
-  DEFAULT_LOGO_URL: 'images/watermark.svg'
-  PROVIDER_NAME: 'Firewall Services'
-  SHOW_POWERED_BY: False
-  SHOW_DEEP_LINKING_IMAGE: False
-  DISPLAY_WELCOME_FOOTER: True,
+  DISABLE_DOMINANT_SPEAKER_INDICATOR: False
+  DISABLE_JOIN_LEAVE_NOTIFICATIONS: False
+  DISABLE_PRESENCE_STATUS: False
+  DISABLE_RINGING: False
+  DISABLE_TRANSCRIPTION_SUBTITLES: True
+  DISABLE_VIDEO_BACKGROUND: False
+  DISPLAY_WELCOME_FOOTER: True
   DISPLAY_WELCOME_PAGE_ADDITIONAL_CARD: False
   DISPLAY_WELCOME_PAGE_CONTENT: False
   DISPLAY_WELCOME_PAGE_TOOLBAR_ADDITIONAL_CONTENT: False
-  GENERATE_ROOMNAMES_ON_WELCOME_PAGE: True
-  APP_NAME: Jitsi Meet
-  NATIVE_APP_NAME: Jitsi Meet
-  INVITATION_POWERED_BY: True
-  LANG_DETECTION: True
-  AUTHENTICATION_ENABLE: True
-  SETTINGS_SECTIONS:
-    - devices
-    - language
-    - moderator
-    - profile
-    - calendar
-  VIDEO_LAYOUT_FIT: both
-  VERTICAL_FILMSTRIP: True
-  CLOSE_PAGE_GUEST_HINT: False
-  SHOW_PROMOTIONAL_CLOSE_PAGE: False
-  RANDOM_AVATAR_URL_PREFIX: False
-  RANDOM_AVATAR_URL_SUFFIX: False
-  FILM_STRIP_MAX_HEIGHT: 120
+  ENABLE_DIAL_OUT: "{{ (jitsi_jigasi_sip_server is defined) | ternary(True, False) }}"
   ENABLE_FEEDBACK_ANIMATION: False
-  DISABLE_FOCUS_INDICATOR: False
-  DISABLE_DOMINANT_SPEAKER_INDICATOR: False
-  DISABLE_TRANSCRIPTION_SUBTITLES: True
-  DISABLE_RINGING: False
-  AUDIO_LEVEL_PRIMARY_COLOR: 'rgba(255,255,255,0.4)'
-  AUDIO_LEVEL_SECONDARY_COLOR: 'rgba(255,255,255,0.2)'
-  POLICY_LOGO: Null
-  LOCAL_THUMBNAIL_RATIO: '16 / 9' # 16:9
-  REMOTE_THUMBNAIL_RATIO: 1 # 1:1
-  LIVE_STREAMING_HELP_LINK: 'https://jitsi.org/live'
-  MOBILE_APP_PROMO: True
-  MOBILE_DOWNLOAD_LINK_ANDROID: 'https://play.google.com/store/apps/details?id=org.jitsi.meet'
-  MOBILE_DOWNLOAD_LINK_F_DROID: 'https://f-droid.org/en/packages/org.jitsi.meet/'
-  MOBILE_DOWNLOAD_LINK_IOS: 'https://itunes.apple.com/us/app/jitsi-meet/id1165103905'
+  FILM_STRIP_MAX_HEIGHT: 120
+  GENERATE_ROOMNAMES_ON_WELCOME_PAGE: True
+  HIDE_INVITE_MORE_HEADER: False
+  JITSI_WATERMARK_LINK: https://www.ehtrace.com
+  LANG_DETECTION: True
+  LOCAL_THUMBNAIL_RATIO: 16 / 9
   MAXIMUM_ZOOMING_COEFFICIENT: 1.3
-  SUPPORT_URL: https://community.jitsi.org/
-  CONNECTION_INDICATOR_AUTO_HIDE_ENABLED: True
-  CONNECTION_INDICATOR_AUTO_HIDE_TIMEOUT: 5000
-  CONNECTION_INDICATOR_DISABLED: False
-  VIDEO_QUALITY_LABEL_DISABLED: False
-  RECENT_LIST_ENABLED: True
-  OPTIMAL_BROWSERS: 
+  MOBILE_APP_PROMO: True
+  OPTIMAL_BROWSERS:
     - chrome
     - chromium
     - firefox
     - nwjs
     - electron
     - safari
-  UNSUPPORTED_BROWSERS: []
-  AUTO_PIN_LATEST_SCREEN_SHARE: remote-only
-  DISABLE_PRESENCE_STATUS: False
-  DISABLE_JOIN_LEAVE_NOTIFICATIONS: False
+  POLICY_LOGO: null
+  PROVIDER_NAME: Ehtrace
+  RECENT_LIST_ENABLED: True
+  REMOTE_THUMBNAIL_RATIO: 1
+  SETTINGS_SECTIONS:
+    - devices
+    - language
+    - moderator
+    - profile
+    - sounds
+    - more
+  SHOW_BRAND_WATERMARK: False
   SHOW_CHROME_EXTENSION_BANNER: False
-  ENABLE_DIAL_OUT: "{{ (jitsi_jigasi_sip_server is defined) | ternary(True, False) }}"
+  SHOW_JITSI_WATERMARK: False
+  SHOW_POWERED_BY: False
+  SHOW_PROMOTIONAL_CLOSE_PAGE: False
+  SUPPORT_URL: 'mailto:support@ehtrace.com'
+  UNSUPPORTED_BROWSERS: []
+  VERTICAL_FILMSTRIP: True
+  VIDEO_LAYOUT_FIT: both
+  VIDEO_QUALITY_LABEL_DISABLED: False
 
 jitsi_meet_interface_conf_extra: {}
 jitsi_meet_interface_conf: "{{ jitsi_meet_interface_conf_base | combine(jitsi_meet_interface_conf_extra, recursive=True) }}"
 
 # You can customize strings here (lang/main-XX.json)
-jitsi_meet_custom_lang:
-  fr:
-    welcomepage:
-      headerSubtitle: >-
-        La vidéoconférence simple, sécurisée, libre
-      startMeeting: >-
-        C'est parti !
-      appDescription: >-
-        Choisissez un nom ou bien laisser le système en créer un pour vous,
-        partagez le lien avec qui vous voulez.
-        Jamais la vidéoconférence n'a été aussi simple
+jitsi_meet_custom_lang: {}
+#  fr:
+#    welcomepage:
+#      headerSubtitle: >-
+#        La vidéoconférence simple, sécurisée, libre
+#      startMeeting: >-
+#        C'est parti !
+#      appDescription: >-
+#        Choisissez un nom ou bien laisser le système en créer un pour vous,
+#        partagez le lien avec qui vous voulez.
+#        Jamais la vidéoconférence n'a été aussi simple
 
 
 # If jitsi_auth is ldap
diff --git a/roles/jitsi/templates/meet.js.j2 b/roles/jitsi/templates/meet.js.j2
index fa6e9e5..67781eb 100644
--- a/roles/jitsi/templates/meet.js.j2
+++ b/roles/jitsi/templates/meet.js.j2
@@ -1 +1,20 @@
+var subdir = '<!--# echo var="subdir" default="" -->';
+var subdomain = '<!--# echo var="subdomain" default="" -->';
+
+if (subdomain) {
+    subdomain = subdomain.substr(0, subdomain.length - 1).split('.')
+        .join('_')
+        .toLowerCase() + '.';
+}
+
+// In case of no ssi provided by the webserver, use empty strings
+if (subdir.startsWith('<!--')) {
+    subdir = '';
+}
+if (subdomain.startsWith('<!--')) {
+    subdomain = '';
+}
+
+var enableJaaS = false;
+
 var config = {{ jitsi_meet_conf | to_nice_json(indent=4) }};