Commit Graph

141 Commits (master)

Author SHA1 Message Date
Dan Caseley 7fd1ba5d24
Merge pull request #47 from evdherberg/with-client-plugin-installed
Update of dev environment
2021-12-20 11:30:06 +00:00
Dan Caseley c7efe32e96 Update scripts to ignore fixed name formats 2021-12-20 11:28:33 +00:00
Dan Caseley d319c68a10 Update blocking to ignore fixed names
Docker Compose may use hyphens or underscores, depending on platform or version
2021-12-20 11:16:40 +00:00
Emiel van der Herberg d6f5761fbc No copying of hazelcast plugin to non-clustered openfire environments. No default inclusion of monitoring plugin. 2021-12-02 13:06:14 +01:00
Emiel van der Herberg 75f74b5795 Update for dev environment, containing:
- Unified structure for auto-loading plugins for different modes of operation
- Added in heapdump/monitoring/jsxc plugins for auto-loading
- Modified scripts to work with (docker compose 2) default of using hyphens for creating service names
- Fixed copy monitoring plugin script and added copy hazelcast plugin script
- Extra scripts for blocking and unblocking server 2 in federation mode
2021-12-01 12:43:18 +01:00
Emiel van der Herberg d158ab353e Merge branch 'master' into with-client-plugin-installed 2021-12-01 12:19:31 +01:00
Dan Caseley ef4c0660a4 Bump hazelcast 2021-12-01 10:07:51 +00:00
Guus der Kinderen f3ec9a1468 Remove debug logging flag in database
By setting the 'debug' flag in the database, Openfire will, at boot time, override the configuration in log4j2.xml.

When debug logging is desired, it's best to configure that in the log4j2.xml file instead of in the database.
2021-12-01 10:26:32 +01:00
Guus der Kinderen 5c8c654542 Update log file locations
Openfire 4.7.0 brings a change to the name of the log files. They've been renamed from 'all.log' to 'openfire.log'.

This commit applies the same change to this project.
2021-12-01 10:26:22 +01:00
Dan Caseley eb2a20911e Postgres trivial bump 2021-11-12 15:29:19 +01:00
Dan Caseley d6e8f727d3 Latest hazelcast
Only change is the cache name change (49e4b5)
2021-11-12 15:29:19 +01:00
Dan Caseley f87d5fdaf2 Plugins for federating xmpp cluster 2021-11-02 09:31:12 +01:00
Dan Caseley 89cb3e1b61 Update Hazelcast plugin to latest master 2021-10-28 08:06:32 +02:00
Dan Caseley baf835561e Load balance connections from other domain over s2s via nginx
Prevents otherxmpp always preferring a connection to node 3 in the cluster.

My testing shows clients from both sides being able to initiate and connect to a MUC on the other side of the s2s connection, although I'm certain that the timings and strategy might want tuning for anything production-like (and perhaps even for testing environments if we hit issues)
2021-10-22 16:25:56 +02:00
Emiel van der Herberg 331bcdaff8 Merge branch 'with-client-plugin-installed' of https://github.com/evdherberg/openfire-docker-compose into with-client-plugin-installed 2021-10-12 11:34:35 +02:00
Dan Caseley b56573508f
Merge pull request #40 from guusdk/hazelcast-update
Update hazelcast plugin
2021-10-04 15:36:07 +01:00
Guus der Kinderen 3406ebad03 Update hazelcast plugin
This version of the plugin has been built using the latest changes to the project (migrating the non-Hazelcast specific session code to Openfire).
2021-09-30 17:17:05 +02:00
Emiel van der Herberg 423b589e69 Merge branch 'master' into with-client-plugin-installed 2021-09-30 13:52:35 +02:00
Emiel van der Herberg 4790b2b324
Merge branch 'surevine:master' into with-client-plugin-installed 2021-09-30 13:51:46 +02:00
Emiel van der Herberg 00efb4c576
Merge branch 'surevine:master' into master 2021-09-30 13:31:19 +02:00
Dan Caseley 99a7ea8b6e Ignore fetched logs from git 2021-09-30 10:31:25 +02:00
Dan Caseley eea4169327 Fix typo in otherdomain docker compose 2021-09-30 10:31:25 +02:00
Emiel van der Herberg 0f51ad7213
Updated cert for otherdomain (#38)
New self signed certs for the other domain.
Pull in all log files with get_logs.

Co-authored-by: Emiel van der Herberg <emiel.van.der.herberg@marviq.com>
2021-09-29 15:15:29 +02:00
Emiel van der Herberg 2fbb691774 Merge branch 'master' of https://github.com/evdherberg/openfire-docker-compose 2021-09-29 15:12:06 +02:00
Emiel van der Herberg 70bd057fb6
Merge branch 'surevine:master' into master 2021-09-29 15:10:03 +02:00
Emiel van der Herberg 929551d33c New self signed certs for the other domain.
Pull in all log files with get_logs.
2021-09-29 15:03:20 +02:00
Emiel van der Herberg 23b9978f42 Replaced hazelcast plugin with a newly built one. 2021-09-29 12:17:38 +02:00
Emiel van der Herberg 590de6dec7 Replaced hazelcast plugin with a newly built one. 2021-09-29 12:14:55 +02:00
Emiel van der Herberg d118c43d1e Replaced hazelcast plugin with a newly built one. 2021-09-29 11:55:43 +02:00
Dan Caseley 972386505c Fix copy pasta in getopts 2021-09-28 18:44:59 +02:00
Dan Caseley f49b7f0a0b
Merge pull request #35 from surevine/second-domain
Merge 'second domain' branch to master
2021-09-22 13:07:15 +01:00
Dan Caseley c98cd9e3b0
Merge pull request #34 from guusdk/second-domain
Augmented documentation for 'other domain'
2021-09-22 13:01:58 +01:00
Guus der Kinderen 3ca709e849 Augmented documentation for 'other domain' 2021-09-22 13:43:36 +02:00
Dan Caseley 185891aeeb
Initial version of other XMPP domain and infrastructure 2021-09-12 14:51:22 +01:00
Dan Caseley bcd2fc01eb
Switch start file to getopts to remove ordering constraint 2021-09-10 09:52:03 +01:00
Dan Caseley 2401e81cca
Merge pull request #33 from surevine/new_dockerfile
Map host plugins to staging area within container
2021-09-07 10:28:37 +01:00
Dan Caseley ff08377de0
Merge pull request #32 from surevine/unclustering
Add cluster blocking and unblocking
2021-09-07 10:28:22 +01:00
Dan Caseley cdd59e6ebb
Add scripts for dropping and readding nodes to the cluster 2021-09-03 19:56:43 +01:00
Dan Caseley 083492c488
Map host plugins to staging area within container
Compatible with Openfire 4.7+ entrypoint script
2021-09-03 18:28:55 +01:00
Dan Caseley fdd2932d3e
Merge pull request #29 from surevine/housekeeping
Housekeeping
2021-09-03 18:22:52 +01:00
Dan Caseley 4911c0f9a5
Stop launch when the database fails 2021-09-03 18:21:38 +01:00
Dan Caseley e2279def35
Remove redundant subfolder 2021-09-03 18:21:07 +01:00
Dan Caseley 85057c6263
Deduplicate some plugins 2021-09-03 18:20:42 +01:00
Dan Caseley c646223aee
Tidy utility scripts out of the root 2021-09-03 18:19:11 +01:00
Dan Caseley 0615e136e5
Remove unnecessary Openfire config files 2021-09-03 18:19:01 +01:00
Dan Caseley 879fa157bf
Merge pull request #31 from surevine/add_third_openfire
Add third Openfire server to cluster setup
2021-08-16 08:20:33 +01:00
Dan Caseley f7fdab306c
Fix IP address typos 2021-08-04 20:53:32 +01:00
Dan Caseley f9e219d8fc
Add third Openfire node to the cluster 2021-08-04 20:50:44 +01:00
Dan Caseley 5e03c085f9 Add support for specifying openfire tags via env or parameter
Setting .env to "461" or running `./start.sh 461` will get openfire:461 rather than latest
2021-01-26 11:38:35 +00:00
Dan Caseley d25d3225cb A few useful debugging scripts 2020-12-18 16:52:59 +01:00