From 9b895a6df51956b2eddf9dd5740572fff820e449 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 19 May 2016 11:57:04 -0400
Subject: [PATCH] Ubuntu 16.04 ejabberd patch updated

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 installer/16.04-xenial/ejabberd.EG.patch | 120 ++++++++++++++++---------------
 1 file changed, 61 insertions(+), 59 deletions(-)

diff --git a/installer/16.04-xenial/ejabberd.EG.patch b/installer/16.04-xenial/ejabberd.EG.patch
index 329bfad53..abcc90875 100644
--- a/installer/16.04-xenial/ejabberd.EG.patch
+++ b/installer/16.04-xenial/ejabberd.EG.patch
@@ -1,62 +1,64 @@
---- ejabberd.cfg	2010-08-13 16:03:40.000000000 -0400
-+++ /tmp/ejabberd.cfg.orig	2010-08-13 16:07:13.000000000 -0400
-@@ -58,7 +58,7 @@
- {acl, admin, {user, "", "localhost"}}.
+--- ejabberd.orig.yml	2016-05-19 11:50:11.973825054 -0400
++++ /etc/ejabberd/ejabberd.yml	2016-05-19 11:53:47.231608677 -0400
+@@ -82,6 +82,8 @@
+ ##
+ hosts:
+   - "localhost"
++  - "private.localhost"                                                        
++  - "public.localhost"
  
- %% Hostname
--{hosts, ["localhost"]}.
-+{hosts, ["public.localhost", "private.localhost"]}.
+ ##
+ ## route_subdomains: Delegate subdomains to other XMPP servers.
+@@ -120,7 +122,7 @@
+     protocol_options:
+       - "no_sslv3"
+     ##   - "no_tlsv1"
+-    max_stanza_size: 65536
++    max_stanza_size: 2000000
+     shaper: c2s_shaper
+     access: c2s
+     zlib: true
+@@ -239,7 +241,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"
+@@ -384,12 +386,12 @@
+   ##
+   ## The "normal" shaper limits traffic speed to 1000 B/s
+   ##
+-  normal: 1000
++  normal: 10000
  
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+   ##
+   ## The "fast" shaper limits traffic speed to 50000 B/s
+   ##
+-  fast: 50000
++  fast: 500000
  
-@@ -115,7 +115,7 @@
-   {5222, ejabberd_c2s, [
- 			{access, c2s},
- 			{shaper, c2s_shaper},
--			{max_stanza_size, 65536},
-+			{max_stanza_size, 2000000},
-                         %%zlib,
- 			starttls, {certfile, "/etc/ejabberd/ejabberd.pem"}
- 		       ]},
-@@ -133,7 +133,7 @@
- 
-   {5269, ejabberd_s2s_in, [
- 			   {shaper, s2s_shaper},
--			   {max_stanza_size, 131072}
-+			   {max_stanza_size, 2000000}
- 			  ]},
- 
-   %% External MUC jabber-muc
-@@ -406,12 +406,12 @@
- %%
- %% The "normal" shaper limits traffic speed to 1.000 B/s
- %%
--{shaper, normal, {maxrate, 1000}}.
-+{shaper, normal, {maxrate, 500000}}.
- 
- %%
- %% The "fast" shaper limits traffic speed to 50.000 B/s
- %%
--{shaper, fast, {maxrate, 50000}}.
-+{shaper, normal, {maxrate, 500000}}.
- 
- 
- %%%   ====================
-@@ -457,7 +457,7 @@
- %%%   ACCESS RULES
- 
- %% Define the maximum number of time a single user is allowed to connect:
--{access, max_user_sessions, [{10, all}]}.
-+{access, max_user_sessions, [{5000, all}]}.
- 
- %% Maximum number of offline messages that users can have:
- {access, max_user_offline_messages, [{5000, admin}, {100, all}]}. 
-@@ -581,7 +581,7 @@
- 		  {max_users, 500}
- 		 ]},
-   %%{mod_muc_log,[]},
--  {mod_offline,  [{access_max_user_messages, max_user_offline_messages}]},
-+  %%{mod_offline,  [{access_max_user_messages, max_user_offline_messages}]},
-   {mod_privacy,  []},
-   {mod_private,  []},
-   {mod_proxy65,  [
+ ##
+ ## This option specifies the maximum number of elements in the queue
+@@ -464,7 +466,7 @@
+ access:
+   ## Maximum number of simultaneous sessions allowed for a single user:
+   max_user_sessions: 
+-    all: 10
++    all: 10000
+   ## Maximum number of offline messages that users can have:
+   max_user_offline_messages: 
+     admin: 5000
+@@ -595,8 +597,8 @@
+   ## mod_muc_log: {}
+   mod_muc_admin: {}
+   ## mod_multicast: {}
+-  mod_offline: 
+-    access_max_user_messages: max_user_offline_messages
++  #mod_offline: 
++  #  access_max_user_messages: max_user_offline_messages
+   mod_ping: {}
+   ## mod_pres_counter:
+   ##   count: 5
-- 
2.11.0