From cafc07d1c6d95effe6b2830a95b2882d82f06fed Mon Sep 17 00:00:00 2001
From: Guus der Kinderen <guus.der.kinderen@gmail.com>
Date: Tue, 15 Nov 2022 17:10:31 +0100
Subject: [PATCH] Switch to 'per server' storage for HTTP File Upload

This replaces functionality added in an earlier commit, that configured Openfire to use a shared volume to store uploaded content, and expose that through the load balancer.

Instead, each Openfire server will now store its own data, and exposes it through a distinct URL. This depends on the fix for issue https://github.com/igniterealtime/openfire-httpFileUpload-plugin/issues/40
---
 cluster/docker-compose-clustered.yml | 3 ---
 cluster/sql/openfire.sql             | 3 ---
 cluster/xmpp/1/conf/openfire.xml     | 9 +++++++++
 cluster/xmpp/2/conf/openfire.xml     | 9 +++++++++
 cluster/xmpp/3/conf/openfire.xml     | 9 +++++++++
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/cluster/docker-compose-clustered.yml b/cluster/docker-compose-clustered.yml
index b209a1b..3124794 100644
--- a/cluster/docker-compose-clustered.yml
+++ b/cluster/docker-compose-clustered.yml
@@ -42,7 +42,6 @@ services:
       - ./_data/xmpp/1/conf:/var/lib/openfire/conf
       - ./_data/plugins:/opt/plugins
       - ../_common/wait-for-it.sh:/wait-for-it.sh
-      - ./_data/shared-httpfileupload-repo:/mnt/shared-httpfileupload-repo
     command: ["/wait-for-it.sh", "-s", "db:5432", "--", "/sbin/entrypoint.sh"]
     networks:
       openfire-clustered-net:
@@ -69,7 +68,6 @@ services:
       - ./_data/xmpp/2/conf:/var/lib/openfire/conf
       - ./_data/plugins:/opt/plugins
       - ../_common/wait-for-it.sh:/wait-for-it.sh
-      - ./_data/shared-httpfileupload-repo:/mnt/shared-httpfileupload-repo
     command: ["/wait-for-it.sh", "-s", "db:5432", "--", "/sbin/entrypoint.sh"]
     networks:
       openfire-clustered-net:
@@ -96,7 +94,6 @@ services:
       - ./_data/xmpp/3/conf:/var/lib/openfire/conf
       - ./_data/plugins:/opt/plugins
       - ../_common/wait-for-it.sh:/wait-for-it.sh
-      - ./_data/shared-httpfileupload-repo:/mnt/shared-httpfileupload-repo
     command: ["/wait-for-it.sh", "-s", "db:5432", "--", "/sbin/entrypoint.sh"]
     networks:
       openfire-clustered-net:
diff --git a/cluster/sql/openfire.sql b/cluster/sql/openfire.sql
index 1aee800..b60022e 100644
--- a/cluster/sql/openfire.sql
+++ b/cluster/sql/openfire.sql
@@ -723,9 +723,6 @@ provider.securityAudit.className	org.jivesoftware.openfire.security.DefaultSecur
 provider.user.className	org.jivesoftware.openfire.user.DefaultUserProvider	0	\N
 passwordKey	YJ1nKWyrMeGvTKu	0	\N
 update.lastCheck	1605956807055	0	\N
-plugin.httpfileupload.fileRepo	/mnt/shared-httpfileupload-repo	0	\N
-plugin.httpfileupload.announcedWebPort	57070	0	\N
-plugin.httpfileupload.announcedWebProtocol	http	0	\N
 \.
 
 
diff --git a/cluster/xmpp/1/conf/openfire.xml b/cluster/xmpp/1/conf/openfire.xml
index 792d76f..a4d5bfe 100644
--- a/cluster/xmpp/1/conf/openfire.xml
+++ b/cluster/xmpp/1/conf/openfire.xml
@@ -64,4 +64,13 @@
   <clustering>
     <enabled>true</enabled>
   </clustering>
+  <plugin>
+    <httpfileupload>
+      <serverspecific>
+        <announcedWebProtocol>http</announcedWebProtocol>
+        <announcedWebHost>localhost</announcedWebHost>
+        <announcedWebPort>7071</announcedWebPort>
+      </serverspecific>
+    </httpfileupload>
+  </plugin>
 </jive>
diff --git a/cluster/xmpp/2/conf/openfire.xml b/cluster/xmpp/2/conf/openfire.xml
index 0cb579c..c722e47 100644
--- a/cluster/xmpp/2/conf/openfire.xml
+++ b/cluster/xmpp/2/conf/openfire.xml
@@ -64,4 +64,13 @@
   <clustering>
     <enabled>true</enabled>
   </clustering>
+  <plugin>
+    <httpfileupload>
+      <serverspecific>
+        <announcedWebProtocol>http</announcedWebProtocol>
+        <announcedWebHost>localhost</announcedWebHost>
+        <announcedWebPort>7072</announcedWebPort>
+      </serverspecific>
+    </httpfileupload>
+  </plugin>
 </jive>
diff --git a/cluster/xmpp/3/conf/openfire.xml b/cluster/xmpp/3/conf/openfire.xml
index 8e9fbfd..27d5a8f 100644
--- a/cluster/xmpp/3/conf/openfire.xml
+++ b/cluster/xmpp/3/conf/openfire.xml
@@ -64,4 +64,13 @@
   <clustering>
     <enabled>true</enabled>
   </clustering>
+  <plugin>
+    <httpfileupload>
+      <serverspecific>
+        <announcedWebProtocol>http</announcedWebProtocol>
+        <announcedWebHost>localhost</announcedWebHost>
+        <announcedWebPort>7073</announcedWebPort>
+      </serverspecific>
+    </httpfileupload>
+  </plugin>
 </jive>