(no commit message)

diff --git a/0-README.rst b/0-README.rst
new file mode 100644 (file)
index 0000000..f3f6ae1
--- /dev/null
+++ b/0-README.rst
@@ -0,0 +1 @@
+Bug report: https://github.com/processone/ejabberd/issues/803
\ No newline at end of file

diff --git a/phork0.txt b/1-phork0.txt
similarity index 100%
rename from phork0.txt
rename to 1-phork0.txt

diff --git a/ejabberd.cfg.txt b/2-ejabberd.cfg.txt
similarity index 96%
rename from ejabberd.cfg.txt
rename to 2-ejabberd.cfg.txt
index 47b4997d8cfb8073456ced37287b85231e2df054..872c56403aafdc7b42ecfebdeefa2bab3b9cb87a 100644 (file)
--- a/ejabberd.cfg.txt
+++ b/2-ejabberd.cfg.txt
@@ -1,104 +1,104 @@
-{acl, admin, {user, "stefan", "endrullis.de"}}.
-{acl, admin, {user, "joerg", "endrullis.de"}}.
-{acl, admin, {user, "cweiske", "cweiske.de"}}.
-{hosts, ["endrullis.de", "cweiske.de"]}.
-{loglevel, 4}.
-{listen,
- [
-  {5222, ejabberd_c2s, [
-                       inet6,
-                       {access, c2s},
-                       {shaper, c2s_shaper},
-                       {max_stanza_size, 65536},
-                       starttls, {certfile, "/etc/ssl/private/cweiske.de_all.pem"}
-                      ]},
-  {5269, ejabberd_s2s_in, [
-                          inet6,
-                          {shaper, s2s_shaper},
-                          {max_stanza_size, 131072}
-                         ]},
-  {5554, ejabberd_service, [
-                           {ip, {127, 0, 0, 1}},
-                           {access, all},
-                           {shaper_rule, fast},
-                           {host, "muc.localhost", [{password, ""}]}
-                           ]},
-  {5555, ejabberd_service, [
-                           {ip, {127, 0, 0, 1}},
-                           {access, all},
-                           {shaper_rule, fast},
-                           {hosts, ["icq.endrullis.de"],
-                                      [{password, ""}]}
-                           ]},
-  {5280, ejabberd_http, [
-                        http_bind,
-                        http_poll,
-                        web_admin
-                       ]}
- ]}.
-{max_fsm_queue, 1000}.
-{s2s_use_starttls, true}.
-{s2s_certfile, "/etc/ssl/private/cweiske.de_all.pem"}.
-{auth_method, internal}.
-{shaper, normal, {maxrate, 1000}}.
-{shaper, fast, {maxrate, 50000}}.
-{acl, local, {user_regexp, ""}}.
-{access, max_user_sessions, [{10, all}]}.
-{access, max_user_offline_messages, [{5000, admin}, {100, all}]}. 
-{access, local, [{allow, local}]}.
-{access, c2s, [{deny, blocked},
-              {allow, all}]}.
-{access, c2s_shaper, [{none, admin},
-                     {normal, all}]}.
-{access, s2s_shaper, [{fast, all}]}.
-{access, announce, [{allow, admin}]}.
-{access, configure, [{allow, admin}]}.
-{access, muc_admin, [{allow, admin}]}.
-{access, muc, [{allow, all}]}.
-{access, register, [{allow, all}]}.
-{access, pubsub_createnode, [{allow, all}]}.
-{language, "en"}.
-{modules,
- [
-  {mod_adhoc,    []},
-  {mod_announce, [{access, announce}]}, % requires mod_adhoc
-  {mod_caps,     []},
-  {mod_configure,[]}, % requires mod_adhoc
-  {mod_admin_extra, []},
-  {mod_disco,    [{extra_domains, ["conference.endrullis.de"]}]},
-  {mod_http_bind, []},
-  {mod_irc,      []},
-  {mod_last,     []},
-  {mod_muc,      [
-                 {access, muc},
-                 {access_create, muc},
-                 {access_persistent, muc},
-                 {access_admin, muc_admin},
-                 {max_users, 500}
-                ]},
-  {mod_offline,  [{access_max_user_messages, max_user_offline_messages}]},
-  {mod_privacy,  []},
-  {mod_private,  []},
-  {mod_proxy65,  [
-                 {access, local},
-                 {shaper, c2s_shaper}
-                ]},
-  {mod_pubsub,   [ % requires mod_caps
-                 {access_createnode, pubsub_createnode},
-                 {pep_sendlast_offline, false},
-                 {last_item_cache, false},
-                 {plugins, ["flat", "hometree", "pep"]}  % pep requires mod_caps
-                ]},
-  {mod_register, [
-                 {welcome_message, {"Welcome!",
-                                    "Welcome to a Jabber service powered by Debian. "
-                                    "For information about Jabber visit "
-                                    "http://www.jabber.org"}},
-                 {access, register}
-                ]},
-  {mod_roster,   []},
-  {mod_stats,    []},
-  {mod_time,     []},
-  {mod_vcard,    []},
-  {mod_version,  []}
- ]}.
+{acl, admin, {user, "stefan", "endrullis.de"}}.\r
+{acl, admin, {user, "joerg", "endrullis.de"}}.\r
+{acl, admin, {user, "cweiske", "cweiske.de"}}.\r
+{hosts, ["endrullis.de", "cweiske.de"]}.\r
+{loglevel, 4}.\r
+{listen,\r
+ [\r
+  {5222, ejabberd_c2s, [\r
+                       inet6,\r
+                       {access, c2s},\r
+                       {shaper, c2s_shaper},\r
+                       {max_stanza_size, 65536},\r
+                       starttls, {certfile, "/etc/ssl/private/cweiske.de_all.pem"}\r
+                      ]},\r
+  {5269, ejabberd_s2s_in, [\r
+                          inet6,\r
+                          {shaper, s2s_shaper},\r
+                          {max_stanza_size, 131072}\r
+                         ]},\r
+  {5554, ejabberd_service, [\r
+                           {ip, {127, 0, 0, 1}},\r
+                           {access, all},\r
+                           {shaper_rule, fast},\r
+                           {host, "muc.localhost", [{password, ""}]}\r
+                           ]},\r
+  {5555, ejabberd_service, [\r
+                           {ip, {127, 0, 0, 1}},\r
+                           {access, all},\r
+                           {shaper_rule, fast},\r
+                           {hosts, ["icq.endrullis.de"],\r
+                                      [{password, ""}]}\r
+                           ]},\r
+  {5280, ejabberd_http, [\r
+                        http_bind,\r
+                        http_poll,\r
+                        web_admin\r
+                       ]}\r
+ ]}.\r
+{max_fsm_queue, 1000}.\r
+{s2s_use_starttls, true}.\r
+{s2s_certfile, "/etc/ssl/private/cweiske.de_all.pem"}.\r
+{auth_method, internal}.\r
+{shaper, normal, {maxrate, 1000}}.\r
+{shaper, fast, {maxrate, 50000}}.\r
+{acl, local, {user_regexp, ""}}.\r
+{access, max_user_sessions, [{10, all}]}.\r
+{access, max_user_offline_messages, [{5000, admin}, {100, all}]}. \r
+{access, local, [{allow, local}]}.\r
+{access, c2s, [{deny, blocked},\r
+              {allow, all}]}.\r
+{access, c2s_shaper, [{none, admin},\r
+                     {normal, all}]}.\r
+{access, s2s_shaper, [{fast, all}]}.\r
+{access, announce, [{allow, admin}]}.\r
+{access, configure, [{allow, admin}]}.\r
+{access, muc_admin, [{allow, admin}]}.\r
+{access, muc, [{allow, all}]}.\r
+{access, register, [{allow, all}]}.\r
+{access, pubsub_createnode, [{allow, all}]}.\r
+{language, "en"}.\r
+{modules,\r
+ [\r
+  {mod_adhoc,    []},\r
+  {mod_announce, [{access, announce}]}, % requires mod_adhoc\r
+  {mod_caps,     []},\r
+  {mod_configure,[]}, % requires mod_adhoc\r
+  {mod_admin_extra, []},\r
+  {mod_disco,    [{extra_domains, ["conference.endrullis.de"]}]},\r
+  {mod_http_bind, []},\r
+  {mod_irc,      []},\r
+  {mod_last,     []},\r
+  {mod_muc,      [\r
+                 {access, muc},\r
+                 {access_create, muc},\r
+                 {access_persistent, muc},\r
+                 {access_admin, muc_admin},\r
+                 {max_users, 500}\r
+                ]},\r
+  {mod_offline,  [{access_max_user_messages, max_user_offline_messages}]},\r
+  {mod_privacy,  []},\r
+  {mod_private,  []},\r
+  {mod_proxy65,  [\r
+                 {access, local},\r
+                 {shaper, c2s_shaper}\r
+                ]},\r
+  {mod_pubsub,   [ % requires mod_caps\r
+                 {access_createnode, pubsub_createnode},\r
+                 {pep_sendlast_offline, false},\r
+                 {last_item_cache, false},\r
+                 {plugins, ["flat", "hometree", "pep"]}  % pep requires mod_caps\r
+                ]},\r
+  {mod_register, [\r
+                 {welcome_message, {"Welcome!",\r
+                                    "Welcome to a Jabber service powered by Debian. "\r
+                                    "For information about Jabber visit "\r
+                                    "http://www.jabber.org"}},\r
+                 {access, register}\r
+                ]},\r
+  {mod_roster,   []},\r
+  {mod_stats,    []},\r
+  {mod_time,     []},\r
+  {mod_vcard,    []},\r
+  {mod_version,  []}\r
+ ]}.\r