diff --git a/README.md b/README.md index 10108e6..a998073 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Running `./start.sh` will perform some cleanup then start the containers. When r Data and config snapshots have been taken of each DB and Openfire so that a known desired state is configured on start. See the "How it's built" section below if you want to understand how this was done or need to add more nodes. -Openfire is configured with the following hostnames: +Openfire is configured with the following hostnames/XMPP domain names: * `xmpp1.localhost.example` * `xmpp2.localhost.example` diff --git a/sql/1/openfire.sql b/sql/1/openfire.sql index a231d93..36b2581 100644 --- a/sql/1/openfire.sql +++ b/sql/1/openfire.sql @@ -611,7 +611,7 @@ COPY public.ofid (idtype, id) FROM stdin; 26 2 23 6 27 51 -25 7 +25 9 \. @@ -620,8 +620,8 @@ COPY public.ofid (idtype, id) FROM stdin; -- COPY public.ofmucaffiliation (roomid, jid, affiliation) FROM stdin; -1 admin@localhost.example 10 -2 admin@localhost.example 10 +1 admin@xmpp1.localhost.example 10 +2 admin@xmpp1.localhost.example 10 \. @@ -630,9 +630,8 @@ COPY public.ofmucaffiliation (roomid, jid, affiliation) FROM stdin; -- COPY public.ofmucconversationlog (roomid, messageid, sender, nickname, logtime, subject, body, stanza) FROM stdin; -1 1 muc1@conference.localhost.example \N 001589367372981 \N -2 2 muc2@conference.localhost.example \N 001589367388443 \N -2 3 muc2@conference.localhost.example \N 001589367409138 \N +1 1 muc1@conference.xmpp1.localhost.example \N 001589969810105 \N +2 2 muc2@conference.xmpp1.localhost.example \N 001589969839581 \N \. @@ -649,8 +648,8 @@ COPY public.ofmucmember (roomid, jid, nickname, firstname, lastname, url, email, -- COPY public.ofmucroom (serviceid, roomid, creationdate, modificationdate, name, naturalname, description, lockeddate, emptydate, canchangesubject, maxusers, publicroom, moderated, membersonly, caninvite, roompassword, candiscoverjid, logenabled, subject, rolestobroadcast, usereservednick, canchangenick, canregister, allowpm) FROM stdin; -1 1 001589367372976 001589367372987 muc1 MUC One First MUC Room 000000000000000 001589367372976 0 30 1 0 0 0 \N 0 1 7 0 1 1 0 -1 2 001589367388440 001589367409139 muc2 MUC Two Second MUC Room 000000000000000 001589367388440 0 30 1 0 0 0 \N 0 1 7 0 1 1 0 +1 1 001589969810096 001589969810113 muc1 MUC One The first MUC room 000000000000000 001589969810096 0 30 1 0 0 0 \N 0 1 7 0 1 1 0 +1 2 001589969839579 001589969839582 muc2 MUC Two The second MUC room 000000000000000 001589969839579 0 30 1 0 0 0 \N 0 1 7 0 1 1 0 \. @@ -711,7 +710,7 @@ COPY public.ofproperty (name, propvalue, encrypted, iv) FROM stdin; user.scramHashedPasswordOnly true 0 \N xmpp.socket.ssl.active true 0 \N provider.admin.className org.jivesoftware.openfire.admin.DefaultAdminProvider 0 \N -xmpp.domain localhost.example 0 \N +xmpp.domain xmpp1.localhost.example 0 \N xmpp.auth.anonymous false 0 \N provider.auth.className org.jivesoftware.openfire.auth.DefaultAuthProvider 0 \N provider.lockout.className org.jivesoftware.openfire.lockout.DefaultLockOutProvider 0 \N @@ -719,7 +718,7 @@ provider.group.className org.jivesoftware.openfire.group.DefaultGroupProvider 0 provider.vcard.className org.jivesoftware.openfire.vcard.DefaultVCardProvider 0 \N provider.securityAudit.className org.jivesoftware.openfire.security.DefaultSecurityAuditProvider 0 \N provider.user.className org.jivesoftware.openfire.user.DefaultUserProvider 0 \N -update.lastCheck 1589367299877 0 \N +update.lastCheck 1589969700591 0 \N \. @@ -818,12 +817,14 @@ COPY public.ofsaslauthorized (username, principal) FROM stdin; -- COPY public.ofsecurityauditlog (msgid, username, entrystamp, summary, node, details) FROM stdin; -1 admin 1589367279639 Successful admin console login attempt xmpp1.localhost.example The user logged in successfully to the admin console from address 172.50.0.1. -2 admin 1589367337559 created new user user1 xmpp1.localhost.example name = User One, email = null, admin = false -3 admin 1589367352175 created new user user2 xmpp1.localhost.example name = User Two, email = null, admin = false -4 admin 1589367372997 created new MUC room muc1 xmpp1.localhost.example subject = \nroomdesc = First MUC Room\nroomname = MUC One\nmaxusers = 30 -5 admin 1589367388451 created new MUC room muc2 xmpp1.localhost.example subject = \nroomdesc = MUC Room Two\nroomname = MUC 2\nmaxusers = 30 -6 admin 1589367409143 updated MUC room muc2 xmpp1.localhost.example subject = \nroomdesc = Second MUC Room\nroomname = MUC Two\nmaxusers = 30 +1 admin 1589969673420 Successful admin console login attempt xmpp1.localhost.example The user logged in successfully to the admin console from address 172.50.0.1. +2 admin 1589969739473 created new user user1 xmpp1.localhost.example name = User One, email = null, admin = false +3 admin 1589969754150 created new user user2 xmpp1.localhost.example name = User 2, email = null, admin = false +4 admin 1589969762256 edited user user2 xmpp1.localhost.example set name = User Two, email = null, admin = false +5 admin 1589969810129 created new MUC room muc1 xmpp1.localhost.example subject = \nroomdesc = The first MUC room\nroomname = MUC One\nmaxusers = 30 +6 admin 1589969839590 created new MUC room muc2 xmpp1.localhost.example subject = \nroomdesc = The second MUC room\nroomname = MUC Two\nmaxusers = 30 +7 admin 1589969876107 Successful admin console login attempt xmpp1.localhost.example The user logged in successfully to the admin console from address 172.50.0.1. +8 admin 1589970015359 Successful admin console login attempt xmpp1.localhost.example The user logged in successfully to the admin console from address 172.50.0.1. \. @@ -832,9 +833,9 @@ COPY public.ofsecurityauditlog (msgid, username, entrystamp, summary, node, deta -- COPY public.ofuser (username, storedkey, serverkey, salt, iterations, plainpassword, encryptedpassword, name, email, creationdate, modificationdate) FROM stdin; -admin uU1kDb5SjcIsevaIXOJvxPrKnsk= DATPf4SmOYsLTjmz3dee/jhF4OM= TIusSDXL90AobohXRvGizqUqwrg6z22h 4096 \N \N Administrator admin@example.com 0 0 -user1 WtYDUyH5rvUc8QaLOwuYzkj7Et4= ZencBIscHsoZmgcGL+l3YGSiIwc= 6iKVuBontHuAiEAZ/jMjDB2CUQ/PrCX3 4096 \N \N User One \N 001589367337531 001589367337531 -user2 p3iAoc0YJSkcIEELzlkKo3Dwkig= PVya3lE3e0QyFFodSu9VF3B0bz0= N60V7PKEHdTSj14BDEPrXioU9RIyh6S8 4096 \N \N User Two \N 001589367352162 001589367352162 +admin RkmhtYCqZjA8+E9l7dxcQBdJcIA= vYtqqAoXOYARI5QMsqDKyn/WVJY= U+RL6lNHSrJAt3EWynqLGzMOufZk4ZX8 4096 \N \N Administrator admin@example.com 0 0 +user1 OA52wUHrBgujMrHUQmS1K7EBINY= nLvVyejnwRVgJnAFUEihxoJVEH4= P1Kjg4FQhMfTA2u9XEAam6T8IaqFjGEl 4096 \N \N User One \N 001589969739427 001589969739427 +user2 a5UrgV7iwRFlRvt5E/hme7HCq9g= HVruPkJXB83w1B4plK5GZ9xv2pM= TyMmuzTW9qrp6VsK4l1B+Vy6L/ktqE+4 4096 \N \N User Two \N 001589969754137 001589969754137 \. diff --git a/sql/2/openfire.sql b/sql/2/openfire.sql index d9eac00..61ced20 100644 --- a/sql/2/openfire.sql +++ b/sql/2/openfire.sql @@ -611,7 +611,7 @@ COPY public.ofid (idtype, id) FROM stdin; 23 1 26 2 27 1 -25 4 +25 5 \. @@ -704,7 +704,7 @@ COPY public.ofproperty (name, propvalue, encrypted, iv) FROM stdin; user.scramHashedPasswordOnly true 0 \N xmpp.socket.ssl.active true 0 \N provider.admin.className org.jivesoftware.openfire.admin.DefaultAdminProvider 0 \N -xmpp.domain localhost.example 0 \N +xmpp.domain xmpp2.localhost.example 0 \N xmpp.auth.anonymous false 0 \N provider.auth.className org.jivesoftware.openfire.auth.DefaultAuthProvider 0 \N provider.lockout.className org.jivesoftware.openfire.lockout.DefaultLockOutProvider 0 \N @@ -712,7 +712,7 @@ provider.group.className org.jivesoftware.openfire.group.DefaultGroupProvider 0 provider.vcard.className org.jivesoftware.openfire.vcard.DefaultVCardProvider 0 \N provider.securityAudit.className org.jivesoftware.openfire.security.DefaultSecurityAuditProvider 0 \N provider.user.className org.jivesoftware.openfire.user.DefaultUserProvider 0 \N -update.lastCheck 1589374966441 0 \N +update.lastCheck 1589969997215 0 \N \. @@ -811,9 +811,10 @@ COPY public.ofsaslauthorized (username, principal) FROM stdin; -- COPY public.ofsecurityauditlog (msgid, username, entrystamp, summary, node, details) FROM stdin; -1 admin 1589374980787 Successful admin console login attempt xmpp2.localhost.example The user logged in successfully to the admin console from address 172.50.0.1. -2 admin 1589374997180 created new user user1 xmpp2.localhost.example name = User One, email = null, admin = false -3 admin 1589375051427 created new user user2 xmpp2.localhost.example name = User Two, email = null, admin = false +1 admin 1589969968285 Successful admin console login attempt xmpp2.localhost.example The user logged in successfully to the admin console from address 172.50.0.1. +2 admin 1589969986763 created new user user1 xmpp2.localhost.example name = User One, email = null, admin = false +3 admin 1589970003886 created new user user2 xmpp2.localhost.example name = User Two, email = null, admin = false +4 admin 1589970026353 Successful admin console login attempt xmpp2.localhost.example The user logged in successfully to the admin console from address 172.50.0.1. \. @@ -822,9 +823,9 @@ COPY public.ofsecurityauditlog (msgid, username, entrystamp, summary, node, deta -- COPY public.ofuser (username, storedkey, serverkey, salt, iterations, plainpassword, encryptedpassword, name, email, creationdate, modificationdate) FROM stdin; -admin bQjNunFJD9An/QETV8vvlhlp+yM= mAFOyrkEQ1Y2IikIIXWZeQCTCdI= mGLSGHXFbEAMg0dPH7y+NKmx89N/cEp2 4096 \N \N Administrator admin@example.com 0 0 -user1 AToqfo9C4Ta+5bRapHfgl92uXDI= Y2OkwKy//6BwdNpCRN0rVLhkdVc= FDilwFKCGp0qUg9E9byoGbb0SNuM6HUg 4096 \N \N User One \N 001589374997156 001589374997156 -user2 ubU0YeWQiLUINpCPINI7eyZFr1U= eE0ssGKX5J/tTk17NxDNnyH+C94= bywh0rH3ogLs43V5b6Rfopm3Uu++yVBc 4096 \N \N User Two \N 001589375051413 001589375051413 +admin +40WbEXG/DPWcyptuoqy2/rmKgE= z6N147e8IQm7c5+AJj7fr6qDhqs= gE82Agy35CremB/GPqmMuPIduFRMjkRc 4096 \N \N Administrator admin@example.com 0 0 +user1 +G6+jzD12IYr16DzuA0GDgW5ZKI= F0f5ZPr4F0YBB/fqGu4ARN35ZLs= v1WMYcRDffV/jHeVGjnpaxtuyH6jFUJz 4096 \N \N User One \N 001589969986726 001589969986726 +user2 2NjgswI5jFN84U87j2r5Lut4t2A= UNaElmqGi1LTgKxgNfmLaDqVtR4= aV9LvUj9aa0rmOsLX5q086fUNDtM0llq 4096 \N \N User Two \N 001589970003873 001589970003873 \. diff --git a/xmpp/1/conf/openfire.xml b/xmpp/1/conf/openfire.xml index 48b73aa..3f4eb93 100644 --- a/xmpp/1/conf/openfire.xml +++ b/xmpp/1/conf/openfire.xml @@ -45,8 +45,8 @@ org.postgresql.Driver jdbc:postgresql://db1:5432/openfire - db309104b58a24ce1c7d9cff837cc7db2c6ff1b7fd187caf544695ccf3542ba9 - a5ad683ff5c9488da961648db98bde41ed39af3aaa76d7ac + f94224b486addc57cd2f192c4ad04f40d3892f2926d59d0fa2c10e3aa8f08183 + 66e0163425910c48d61764883ee691e072319270b23732db select 1 false false diff --git a/xmpp/1/conf/security/keystore b/xmpp/1/conf/security/keystore index cab1485..39e2a8c 100644 Binary files a/xmpp/1/conf/security/keystore and b/xmpp/1/conf/security/keystore differ diff --git a/xmpp/2/conf/openfire.xml b/xmpp/2/conf/openfire.xml index a3f3792..409ddfd 100644 --- a/xmpp/2/conf/openfire.xml +++ b/xmpp/2/conf/openfire.xml @@ -45,8 +45,8 @@ org.postgresql.Driver jdbc:postgresql://db2:5432/openfire - c45b6de0a1b0324d5aa33d7d04c15de00fd8f123c55897467ffab311b1f7ebcf - eaac1651e83887b3fa7e87083c6a90a536b84528992067fc + 7b76f958da6336c51471d7f2687e0c25dc22b9d5302e7d8fa8701422176812ad + 8b030e683f4cec46f05044d6187227b3bed12d520e91cf0a select 1 false false diff --git a/xmpp/2/conf/security/keystore b/xmpp/2/conf/security/keystore index cb126c9..99fa331 100644 Binary files a/xmpp/2/conf/security/keystore and b/xmpp/2/conf/security/keystore differ