From ff90deff43a608f46537fc688757aff640828906 Mon Sep 17 00:00:00 2001
From: Mathieu Gauthier-Pilote <mgauthier+git@evolix.ca>
Date: Wed, 4 Oct 2023 14:56:28 -0400
Subject: [PATCH] To preserve custom changes to
 welcomePageAdditionalContent.html

---
 webapps/jitsimeet/tasks/main.yml                             | 2 +-
 webapps/jitsimeet/templates/nginx/vhost.conf.j2              | 5 +++++
 .../templates/videobridge/sip-communicator.properties.j2     | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/webapps/jitsimeet/tasks/main.yml b/webapps/jitsimeet/tasks/main.yml
index 4f26f55d..2ea23891 100644
--- a/webapps/jitsimeet/tasks/main.yml
+++ b/webapps/jitsimeet/tasks/main.yml
@@ -98,7 +98,7 @@
     - { src: 'videobridge/sip-communicator.properties.j2', dest: "/etc/jitsi/videobridge/sip-communicator.properties", owner: "jvb", group: "jitsi", mode: "0640" }
     - { src: 'meet/config.js.j2', dest: "/etc/jitsi/meet/{{ domains | first }}-config.js", owner: "root", group: "root", mode: "0644" }
     - { src: 'meet/interface_config.js.j2', dest: "/etc/jitsi/meet/{{ domains | first }}-interface_config.js", owner: "root", group: "root", mode: "0644" }
-    - { src: 'meet/welcomePageAdditionalContent.html.j2', dest: "/usr/share/jitsi-meet/static/welcomePageAdditionalContent.html", owner: "root", group: "root", mode: "0644" }
+    - { src: 'meet/welcomePageAdditionalContent.html.j2', dest: "/etc/jitsi/meet/welcomePageAdditionalContent.html", owner: "root", group: "root", mode: "0644" }
     - { src: 'prosody/virtualhost.cfg.lua.j2', dest: "/etc/prosody/conf.avail/{{ domains | first }}.cfg.lua", owner: "root", group: "root", mode: "0644" }
     - { src: 'coturn/turnserver.conf.j2', dest: "/etc/turnserver.conf", owner: "root", group: "turnserver", mode: "0640" }
     - { src: 'certbot/coturn-certbot-deploy.sh.j2', dest: "/etc/letsencrypt/renewal-hooks/deploy/coturn-certbot-deploy.sh", owner: "root", group: "root", mode: "0700" }
diff --git a/webapps/jitsimeet/templates/nginx/vhost.conf.j2 b/webapps/jitsimeet/templates/nginx/vhost.conf.j2
index 47156004..1b2e6093 100644
--- a/webapps/jitsimeet/templates/nginx/vhost.conf.j2
+++ b/webapps/jitsimeet/templates/nginx/vhost.conf.j2
@@ -76,6 +76,7 @@ server {
   set $custom_index "";
   set $config_js_location /etc/jitsi/meet/{{ domains | first }}-config.js;
   set $interface_config_js_location /etc/jitsi/meet/{{ domains | first }}-interface_config.js;
+  set $welcome_page_additional_content_location /etc/jitsi/meet/welcomePageAdditionalContent.html;
 
   ##
   # Certificates
@@ -112,6 +113,10 @@ server {
   location = /external_api.js {
       alias /usr/share/jitsi-meet/libs/external_api.min.js;
   }
+  
+  location = /static/welcomePageAdditionalContent.html {
+      alias $welcome_page_additional_content_location;
+  }
 
   location = /_api/room-info {
       proxy_pass http://prosody/room-info?prefix=$prefix&$args;
diff --git a/webapps/jitsimeet/templates/videobridge/sip-communicator.properties.j2 b/webapps/jitsimeet/templates/videobridge/sip-communicator.properties.j2
index 2b1dde4e..4b52cafd 100644
--- a/webapps/jitsimeet/templates/videobridge/sip-communicator.properties.j2
+++ b/webapps/jitsimeet/templates/videobridge/sip-communicator.properties.j2
@@ -8,6 +8,6 @@ org.jitsi.videobridge.xmpp.user.shard.USERNAME=jvb
 org.jitsi.videobridge.xmpp.user.shard.PASSWORD={{ jitsi_meet_jvb_secret }}
 org.jitsi.videobridge.xmpp.user.shard.MUC_JIDS=JvbBrewery@internal.auth.{{ domains | first }}
 org.jitsi.videobridge.xmpp.user.shard.MUC_NICKNAME={{ jitsi_meet_jvb_muc_nick }}
-org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./static/welcomePageAdditionalContent.html=/usr/share/jitsi-meet/static/welcomePageAdditionalContent.html
+#org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./static/welcomePageAdditionalContent.html=/usr/share/jitsi-meet/static/welcomePageAdditionalContent.html
 # Switches off the BWE mechanism.
 #org.jitsi.videobridge.TRUST_BWE=false