From: Jason Etheridge Date: Tue, 21 Jun 2022 16:27:08 +0000 (-0400) Subject: adjust ejabberd.EG.patch for buster X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0b3072124cd5bef04c068b7ae6d621842848d8fc;p=working%2Frandom.git adjust ejabberd.EG.patch for buster --- diff --git a/installer/buster/ejabberd.EG.patch b/installer/buster/ejabberd.EG.patch index be9ba1d0b..57e926877 100644 --- a/installer/buster/ejabberd.EG.patch +++ b/installer/buster/ejabberd.EG.patch @@ -1,55 +1,63 @@ ---- ejabberd.yml.orig 2019-01-03 13:39:08.933987000 -0500 -+++ ejabberd.yml 2019-01-03 13:41:18.261987000 -0500 -@@ -82,6 +82,8 @@ - ## +--- ejabberd.yml.orig 2022-06-21 12:18:04.151912484 -0400 ++++ ejabberd.yml 2022-06-21 12:23:25.092318797 -0400 +@@ -49,6 +49,8 @@ + ## - "example.org" hosts: - "localhost" + - "private.localhost" -+ - "public.localhost" ++ - "public.localhost" + + certfiles: + - "/etc/ejabberd/ejabberd.pem" +@@ -81,7 +83,7 @@ + max_stanza_size: 262144 + shaper: c2s_shaper + access: c2s +- starttls_required: true ++ starttls_required: false + protocol_options: 'TLS_OPTIONS' + - + port: 5223 +@@ -121,7 +123,7 @@ + s2s_use_starttls: required - ## - ## route_subdomains: Delegate subdomains to other XMPP servers. -@@ -248,7 +250,7 @@ - ## ## Store the plain passwords or hashed for SCRAM: - ## auth_password_format: plain -auth_password_format: scram +auth_password_format: plain - ## - ## Define the FQDN if ejabberd doesn't detect it: - ## fqdn: "server3.example.com" -@@ -393,12 +395,12 @@ - ## - ## The "normal" shaper limits traffic speed to 1000 B/s - ## -- normal: 1000 -+ normal: 500000 - ## - ## The "fast" shaper limits traffic speed to 50000 B/s - ## + ## Full path to a script that generates the image. + ## captcha_cmd: "/usr/share/ejabberd/captcha.sh" +@@ -188,11 +190,11 @@ + - "connected_users_number" + + shaper: +- normal: 1000 - fast: 50000 ++ normal: 500000 + fast: 500000 - ## - ## This option specifies the maximum number of elements in the queue -@@ -473,7 +475,7 @@ - shaper_rules: - ## Maximum number of simultaneous sessions allowed for a single user: - max_user_sessions: 10 + max_user_sessions: 10000 - ## Maximum number of offline messages that users can have: max_user_offline_messages: - 5000: admin -@@ -607,8 +609,8 @@ - ## mod_muc_log: {} + - 100 +@@ -221,6 +223,7 @@ + ## mod_http_upload: + ## put_url: "https://@HOST@:5443/upload" + mod_last: {} ++ mod_legacy_auth: {} + ## mod_mam: + ## ## Mnesia is limited to 2GB, better to use an SQL backend + ## ## For small servers SQLite is a good fit and is very easy +@@ -238,8 +241,8 @@ + default_room_options: + mam: true mod_muc_admin: {} - ## mod_multicast: {} -- mod_offline: +- mod_offline: - access_max_user_messages: max_user_offline_messages + ##mod_offline: -+ ##access_max_user_messages: max_user_offline_messages ++ ##access_max_user_messages: max_user_offline_messages mod_ping: {} - ## mod_pres_counter: - ## count: 5 + mod_pres_counter: + count: 5