]> granicus.if.org Git - ejabberd/log
ejabberd
9 years agoFix last item message type as message attribute
Christophe Romain [Wed, 16 Dec 2015 16:04:45 +0000 (17:04 +0100)]
Fix last item message type as message attribute

9 years agoUse correct notification_type for last items (#827)
Christophe Romain [Wed, 16 Dec 2015 15:19:35 +0000 (16:19 +0100)]
Use correct notification_type for last items (#827)

9 years agoAdd accept_interval option in ejabberd_listener
Alexey Shchepin [Wed, 16 Dec 2015 14:26:44 +0000 (17:26 +0300)]
Add accept_interval option in ejabberd_listener

9 years agoMerge branch 'master' of github.com:processone/ejabberd
Christophe Romain [Wed, 16 Dec 2015 12:01:12 +0000 (13:01 +0100)]
Merge branch 'master' of github.com:processone/ejabberd

9 years agoDon't read pubsub options when plugin does not use them
Christophe Romain [Wed, 16 Dec 2015 11:56:06 +0000 (12:56 +0100)]
Don't read pubsub options when plugin does not use them

This also revert commit 6052f7b

9 years agoRemove "--enable-nif" flag
Holger Weiss [Sun, 12 Jul 2015 18:58:22 +0000 (20:58 +0200)]
Remove "--enable-nif" flag

Specifying "--enable-nif" or "--disable-nif" when running ejabberd's
configure script has no effect anymore: NIF support is enabled by
default and can only be disabled by building the p1_xml dependency with
"--disable-nif".

9 years agoAdd plugin for passing extra erl_opts flags to deps, and use it for hipe
Paweł Chmielowski [Wed, 16 Dec 2015 11:22:15 +0000 (12:22 +0100)]
Add plugin for passing extra erl_opts flags to deps, and use it for hipe

This fixes #425 in github issue tracker

9 years agoAdvertise MAM in disco info for account/room JID
Holger Weiss [Tue, 15 Dec 2015 23:08:23 +0000 (00:08 +0100)]
Advertise MAM in disco info for account/room JID

As per XEP-0313 version 0.2 and newer, advertise the MAM feature in the
service discovery information for the bare account (or MUC room) JID.

Some clients check the server's discovery information instead, so we'll
continue to advertise the feature there as well.

9 years agoUse MUC domain for 'by' attribute of <stanza-id/>
Holger Weiss [Tue, 15 Dec 2015 20:37:41 +0000 (21:37 +0100)]
Use MUC domain for 'by' attribute of <stanza-id/>

Let mod_mam specify only the domain part of the room JID in the 'by'
attribute of <stanza-id/> tags.

9 years agomod_mam: Keep 'to' attribute for MUC MAM messages
Holger Weiss [Tue, 15 Dec 2015 20:05:04 +0000 (21:05 +0100)]
mod_mam: Keep 'to' attribute for MUC MAM messages

9 years agoFix mod_carboncopy configuration for test suite
Holger Weiss [Tue, 15 Dec 2015 20:02:12 +0000 (21:02 +0100)]
Fix mod_carboncopy configuration for test suite

The mod_carboncopy module doesn't have the "db_type" option.

9 years agoPubSub plugin for online users only
Christophe Romain [Tue, 15 Dec 2015 15:19:54 +0000 (16:19 +0100)]
PubSub plugin for online users only

9 years agoFix pubsub headers
Christophe Romain [Tue, 15 Dec 2015 15:11:29 +0000 (16:11 +0100)]
Fix pubsub headers

9 years agoRestore header in Hebrew translation file
Badlop [Mon, 14 Dec 2015 13:08:44 +0000 (14:08 +0100)]
Restore header in Hebrew translation file

9 years agoMerge pull request #875 from GreenLunar/patch-1
badlop [Mon, 14 Dec 2015 13:04:45 +0000 (14:04 +0100)]
Merge pull request #875 from GreenLunar/patch-1

Update hebrew translation

9 years agoUpdate hebrew translation
GreenLunar [Mon, 14 Dec 2015 12:39:18 +0000 (14:39 +0200)]
Update hebrew translation

Minor corrections, enhancements, and refinements

9 years agoFix pubsub test error
Paweł Chmielowski [Mon, 14 Dec 2015 09:21:23 +0000 (10:21 +0100)]
Fix pubsub test error

9 years agoUse UTF8MB4 character set in MySQL tables
Evgeniy Khramtsov [Tue, 8 Dec 2015 12:56:43 +0000 (15:56 +0300)]
Use UTF8MB4 character set in MySQL tables

9 years agoUse BLOB instead of TEXT on mysql in stanza storage
Pablo Polvorin [Wed, 13 Nov 2013 17:30:29 +0000 (14:30 -0300)]
Use BLOB instead of TEXT on mysql in stanza storage

Mysql 'utf8' do not support 4-bytes UTF8 chars.
Characters like 'KISS MARK' (U+1F48B) causes mysql
to cut the string at that point.
There is utf8mb4 encoding available on newer mysql
versions that do support 4-bytes utf8. But for storing
stanzas, that doesn't need to be indexed or searched or
inspected in any way,  it was easier to use BLOB
(the bytes stored are utf8 encoded anyway, like all XMPP),
and avoids the need to redefine indexes (as allowed size
is shorter on utf8mb4) or having mixed utf8 and utf8mb4
encodings on the same table.

9 years agoRemove undefined macro injected in 3bdd5d0d
Christophe Romain [Fri, 11 Dec 2015 14:33:22 +0000 (15:33 +0100)]
Remove undefined macro injected in 3bdd5d0d

9 years agoRemove http supervisors
Christophe Romain [Wed, 9 Dec 2015 14:40:20 +0000 (15:40 +0100)]
Remove http supervisors

9 years agoRemove receiver's supervisor
Christophe Romain [Wed, 9 Dec 2015 09:06:57 +0000 (10:06 +0100)]
Remove receiver's supervisor

9 years agoDisable use of multi-subscribe and subscription-option on standard plugins
Christophe Romain [Wed, 9 Dec 2015 15:57:43 +0000 (16:57 +0100)]
Disable use of multi-subscribe and subscription-option on standard plugins

9 years agoLimit number of subscriptions per node and allow custom default node configuration
Christophe Romain [Tue, 10 Nov 2015 15:28:57 +0000 (16:28 +0100)]
Limit number of subscriptions per node and allow custom default node configuration

9 years agoVirtual nodetree is not attached to any backend
Christophe Romain [Mon, 30 Nov 2015 14:20:38 +0000 (15:20 +0100)]
Virtual nodetree is not attached to any backend

9 years agoFollow pubsub configuration when using virtual nodetree
Christophe Romain [Mon, 30 Nov 2015 13:57:21 +0000 (14:57 +0100)]
Follow pubsub configuration when using virtual nodetree

9 years agoDon't force max_items_node to MAXITEMS if not defined
Christophe Romain [Thu, 26 Nov 2015 11:37:18 +0000 (12:37 +0100)]
Don't force max_items_node to MAXITEMS if not defined

9 years agomod_mam: Don't store resent messages
Holger Weiss [Wed, 9 Dec 2015 21:44:45 +0000 (22:44 +0100)]
mod_mam: Don't store resent messages

Make sure messages that were resent by the stream management code aren't
stored in MAM.

9 years agoDocument XEP-0334 support
Holger Weiss [Wed, 9 Dec 2015 21:28:44 +0000 (22:28 +0100)]
Document XEP-0334 support

9 years agoDo not forget to include xmlns in mam prefs response (#859)
Evgeniy Khramtsov [Wed, 9 Dec 2015 09:52:30 +0000 (12:52 +0300)]
Do not forget to include xmlns in mam prefs response (#859)

9 years agoFix problem with handling of old db entries in mod_mam
Paweł Chmielowski [Wed, 9 Dec 2015 08:46:45 +0000 (09:46 +0100)]
Fix problem with handling of old db entries in mod_mam

9 years agoDon't let "reopen_log" rotate files (EJAB-1243)
Holger Weiss [Tue, 8 Dec 2015 21:48:04 +0000 (22:48 +0100)]
Don't let "reopen_log" rotate files (EJAB-1243)

Make sure the "reopen_log" command really just reopens log files without
also rotating them.  For rotating log files, the new "rotate_log"
command can be used.

9 years agomod_mam: Update record field type
Holger Weiss [Tue, 8 Dec 2015 21:21:39 +0000 (22:21 +0100)]
mod_mam: Update record field type

9 years agomod_mam: Remove unused code
Holger Weiss [Tue, 8 Dec 2015 21:15:55 +0000 (22:15 +0100)]
mod_mam: Remove unused code

9 years agomod_offline: Fix outdated comments
Holger Weiss [Tue, 8 Dec 2015 20:58:54 +0000 (21:58 +0100)]
mod_offline: Fix outdated comments

9 years agomod_offline: Honor <store/> hint
Holger Weiss [Tue, 8 Dec 2015 20:46:36 +0000 (21:46 +0100)]
mod_offline: Honor <store/> hint

Ignore the "store_empty_body" option for messages that have a <store/>
hint as described in XEP-0334, version 0.2.

9 years agoImprove muc#roomconfig_presencebroadcast support
Alexey Shchepin [Tue, 8 Dec 2015 18:24:39 +0000 (21:24 +0300)]
Improve muc#roomconfig_presencebroadcast support

9 years agoDon't keep 10 sec timeout that i used for testing...
Paweł Chmielowski [Tue, 8 Dec 2015 10:28:03 +0000 (11:28 +0100)]
Don't keep 10 sec timeout that i used for testing...

9 years agoAdd ability to disable timeout for ejabberdctl command
Paweł Chmielowski [Tue, 8 Dec 2015 10:25:26 +0000 (11:25 +0100)]
Add ability to disable timeout for ejabberdctl command

9 years agomod_mam: Honor Message Processing Hints (XEP-0334)
Holger Weiss [Mon, 7 Dec 2015 23:10:00 +0000 (00:10 +0100)]
mod_mam: Honor Message Processing Hints (XEP-0334)

9 years agoIf mod_register access_from is 'none', then don't advertise IBR (#857)
Badlop [Mon, 7 Dec 2015 17:30:52 +0000 (18:30 +0100)]
If mod_register access_from is 'none', then don't advertise IBR (#857)

9 years agoFix more places where random:seed is used
Paweł Chmielowski [Mon, 7 Dec 2015 15:48:29 +0000 (16:48 +0100)]
Fix more places where random:seed is used

9 years agoFix randoms.erl on R17 that don't have random:seed(integer())
Paweł Chmielowski [Mon, 7 Dec 2015 15:37:40 +0000 (16:37 +0100)]
Fix randoms.erl on R17 that don't have random:seed(integer())

9 years agoRemove now() in pubsub code
Paweł Chmielowski [Mon, 7 Dec 2015 15:16:11 +0000 (16:16 +0100)]
Remove now() in pubsub code

9 years agoMore now() replacements
Paweł Chmielowski [Mon, 7 Dec 2015 15:08:57 +0000 (16:08 +0100)]
More now() replacements

9 years agoFix bug in last commit
Paweł Chmielowski [Mon, 7 Dec 2015 09:26:51 +0000 (10:26 +0100)]
Fix bug in last commit

9 years agoMore now() removal
Paweł Chmielowski [Sun, 6 Dec 2015 14:58:46 +0000 (15:58 +0100)]
More now() removal

9 years agoRemove now() - part 1
Paweł Chmielowski [Fri, 4 Dec 2015 14:08:43 +0000 (15:08 +0100)]
Remove now() - part 1

9 years agotrusted_proxies option not parsed correctly (#860)
Badlop [Fri, 4 Dec 2015 12:14:39 +0000 (13:14 +0100)]
trusted_proxies option not parsed correctly (#860)

9 years agoXEP-0198: Fix stanza counting corner case issue
Holger Weiss [Wed, 2 Dec 2015 18:25:10 +0000 (19:25 +0100)]
XEP-0198: Fix stanza counting corner case issue

Don't forget to count outgoing stanzas that are processed while the
ejabberd_c2s process is already waiting for stream resumption.

9 years agoNo need for a top menu link as there's a top page link
Badlop [Wed, 2 Dec 2015 16:10:23 +0000 (17:10 +0100)]
No need for a top menu link as there's a top page link

9 years agoDon't forget copying files that were compiled during `make install`
Paweł Chmielowski [Wed, 2 Dec 2015 11:39:34 +0000 (12:39 +0100)]
Don't forget copying files that were compiled during `make install`

9 years agoWhen user joins logged room, he must be warned (EJAB-726)
Badlop [Wed, 2 Dec 2015 11:07:29 +0000 (12:07 +0100)]
When user joins logged room, he must be warned (EJAB-726)

9 years agoOnly filter rooms in Service Disco when more than 100 (EJAB-343)
Badlop [Wed, 2 Dec 2015 01:32:14 +0000 (02:32 +0100)]
Only filter rooms in Service Disco when more than 100 (EJAB-343)

9 years agoList in Service Disco non-empty rooms and provide Node for empty (EJAB-343)
Badlop [Wed, 2 Dec 2015 00:50:30 +0000 (01:50 +0100)]
List in Service Disco non-empty rooms and provide Node for empty (EJAB-343)

9 years agoUpdate cache_tab app name
Mickael Remond [Tue, 1 Dec 2015 18:17:51 +0000 (19:17 +0100)]
Update cache_tab app name

9 years agoMerge pull request #849 from weiss/discard-chat-states
Evgeny Khramtsov [Tue, 1 Dec 2015 11:57:49 +0000 (14:57 +0300)]
Merge pull request #849 from weiss/discard-chat-states

mod_offline: Support discarding chat state notifications

9 years agoFix archive preference retreiving (#848)
Evgeniy Khramtsov [Tue, 1 Dec 2015 11:05:54 +0000 (14:05 +0300)]
Fix archive preference retreiving (#848)

9 years agoWebadmin console visual refresh (thanks to Marek Foss) (EJAB-1142)
Christophe Romain [Mon, 30 Nov 2015 10:35:53 +0000 (11:35 +0100)]
Webadmin console visual refresh (thanks to Marek Foss) (EJAB-1142)

9 years agoSimplify external components configuration
Evgeniy Khramtsov [Sat, 28 Nov 2015 14:38:10 +0000 (17:38 +0300)]
Simplify external components configuration

9 years agomod_offline: Support discarding chat states
Holger Weiss [Wed, 25 Nov 2015 07:58:22 +0000 (08:58 +0100)]
mod_offline: Support discarding chat states

XEP-0160 says that standalone chat state notifications should not be
stored offline.  By default, mod_offline discards them now.

Closes #842.

9 years agoAlways use occupant JID as 'from' for room subject
Holger Weiss [Tue, 24 Nov 2015 23:05:24 +0000 (00:05 +0100)]
Always use occupant JID as 'from' for room subject

When sending the room subject to a new participant, always use the
occupant JID that corresponds to the subject author as the 'from'
address.  It was already done this way when the subject was sent as part
of the room history.

9 years agoMake JID related functions from jlib.erl deprecated
Evgeniy Khramtsov [Tue, 24 Nov 2015 17:24:43 +0000 (20:24 +0300)]
Make JID related functions from jlib.erl deprecated

9 years agoMove JID related functions to jid.erl (#847)
Evgeniy Khramtsov [Tue, 24 Nov 2015 15:44:13 +0000 (18:44 +0300)]
Move JID related functions to jid.erl (#847)

9 years agoMake Riak working on R18
Evgeniy Khramtsov [Mon, 23 Nov 2015 09:50:08 +0000 (12:50 +0300)]
Make Riak working on R18

9 years agoRemove useless export_all flag
Christophe Romain [Mon, 23 Nov 2015 11:03:08 +0000 (12:03 +0100)]
Remove useless export_all flag

9 years agoExport content_type/3 needed by mod_http_upload
Christophe Romain [Mon, 23 Nov 2015 10:53:36 +0000 (11:53 +0100)]
Export content_type/3 needed by mod_http_upload

9 years agoMerge branch 'cluster_fix'
Christophe Romain [Fri, 20 Nov 2015 13:52:36 +0000 (14:52 +0100)]
Merge branch 'cluster_fix'

9 years agoAllow longer command execution time 15.11
Christophe Romain [Fri, 20 Nov 2015 08:57:55 +0000 (09:57 +0100)]
Allow longer command execution time

9 years agoIntegrate join/leave cluster as ejabberd command
Christophe Romain [Fri, 20 Nov 2015 08:53:53 +0000 (09:53 +0100)]
Integrate join/leave cluster as ejabberd command

9 years agoMerge pull request #840 from cenobites/mod_ping
Evgeny Khramtsov [Wed, 18 Nov 2015 13:35:49 +0000 (16:35 +0300)]
Merge pull request #840 from cenobites/mod_ping

Adding ping_ack_timeout in mod_opt_type configuration

9 years agoExplain that reload_config only affects to ACL and Access
Badlop [Wed, 18 Nov 2015 12:25:19 +0000 (13:25 +0100)]
Explain that reload_config only affects to ACL and Access

9 years agoAdding ping_ack_timeout in mod_opt_type configuration
Nycholas de Oliveira e Oliveira [Wed, 18 Nov 2015 12:25:01 +0000 (10:25 -0200)]
Adding ping_ack_timeout in mod_opt_type configuration

Avoid the error output

```
2015-11-18 12:02:40.297 [error] <0.37.0>@gen_mod:validate_opts:250 unknown option 'ping_ack_timeout' for module 'mod_ping' will be likely ignored, available options are: 'iqdisc', 'ping_interval', 'send_pings', 'timeout_action'
2015-11-18 12:02:40.334 [error] <0.37.0>@gen_mod:validate_opts:250 unknown option 'ping_ack_timeout' for module 'mod_ping' will be likely ignored, available options are: 'iqdisc', 'ping_interval', 'send_pings', 'timeout_action'
```

In setting mod_opt_type default, ping_ack_timeout parameter was added.

9 years agoFix example config about ejabberd_xmlrpc (#771)
Badlop [Tue, 17 Nov 2015 20:33:28 +0000 (21:33 +0100)]
Fix example config about ejabberd_xmlrpc (#771)

9 years agomod_http_upload: Return error atoms, not strings
Holger Weiss [Mon, 16 Nov 2015 23:12:20 +0000 (00:12 +0100)]
mod_http_upload: Return error atoms, not strings

Don't convert error atoms to strings before actually logging them.  This
avoids a bogus error message when a user who has no uploaded files is
removed.

9 years agoDisable vJUD by default also in mod_vcard_ldap source code
Badlop [Fri, 13 Nov 2015 18:33:23 +0000 (19:33 +0100)]
Disable vJUD by default also in mod_vcard_ldap source code

9 years agoDisable vJUD search in the default config and when not specified
Badlop [Fri, 13 Nov 2015 18:30:11 +0000 (19:30 +0100)]
Disable vJUD search in the default config and when not specified

9 years agoSupport for muc#roomconfig_presencebroadcast option
Alexey Shchepin [Thu, 12 Nov 2015 16:51:20 +0000 (19:51 +0300)]
Support for muc#roomconfig_presencebroadcast option

9 years agoFix problem with pipelined http requests arriving in single packet
Paweł Chmielowski [Thu, 12 Nov 2015 16:23:39 +0000 (17:23 +0100)]
Fix problem with pipelined http requests arriving in single packet

This fixes github issue ejabberd#835

9 years agomod_http_upload: Log message if URL looks wrong
Holger Weiss [Wed, 11 Nov 2015 21:51:40 +0000 (22:51 +0100)]
mod_http_upload: Log message if URL looks wrong

Log an [info] message if a PUT request looks like the specified
"put_url" contains a path component that doesn't match the
"request_handlers" path, as in the following configuration:

  listen:
    -
      module: ejabberd_http
      port: 5444
      request_handlers:
        "/": mod_http_upload

  modules:
    mod_http_upload:
      put_url: "http://example.com/path/"

9 years agomod_http_upload_quota: Don't track all users
Holger Weiss [Tue, 10 Nov 2015 21:08:16 +0000 (22:08 +0100)]
mod_http_upload_quota: Don't track all users

Don't track the disk usage of accounts that have an unlimited quota.

9 years agomod_http_upload: Make case indentation consistent
Holger Weiss [Mon, 9 Nov 2015 18:23:52 +0000 (19:23 +0100)]
mod_http_upload: Make case indentation consistent

Use four spaces (or the corresponding amount of tab characters) for case
indentation everywhere in mod_http_upload and mod_http_upload_quota.

9 years agomod_http_upload: Apply cosmetic changes
Holger Weiss [Mon, 9 Nov 2015 18:12:08 +0000 (19:12 +0100)]
mod_http_upload: Apply cosmetic changes

9 years agomod_http_upload: Don't flatten command strings
Holger Weiss [Mon, 9 Nov 2015 17:50:45 +0000 (18:50 +0100)]
mod_http_upload: Don't flatten command strings

9 years agomod_http_upload: Don't let identify/1 return error
Holger Weiss [Mon, 9 Nov 2015 17:41:31 +0000 (18:41 +0100)]
mod_http_upload: Don't let identify/1 return error

Let identify/1 return 'pass' when it failed to identify the file type,
as this doesn't (necessarily) indicate an error condition.  This also
makes it consistent with the return value of convert/2.

9 years agoUse xml_stream:reset() when possible
Paweł Chmielowski [Mon, 9 Nov 2015 15:05:02 +0000 (16:05 +0100)]
Use xml_stream:reset() when possible

9 years agoMerge pull request #821 from scrogson/update_readme_openssl
Evgeny Khramtsov [Thu, 5 Nov 2015 09:10:38 +0000 (12:10 +0300)]
Merge pull request #821 from scrogson/update_readme_openssl

Update minimum required OpenSSL version

9 years agoUpdate minimum required OpenSSL version
Sonny Scroggin [Thu, 5 Nov 2015 05:21:08 +0000 (23:21 -0600)]
Update minimum required OpenSSL version

9 years agoRemove supervisor option, disable it for c2s and muc
Christophe Romain [Wed, 4 Nov 2015 15:24:35 +0000 (16:24 +0100)]
Remove supervisor option, disable it for c2s and muc

9 years agoAdd copyright and license to HTTP upload modules
Holger Weiss [Wed, 4 Nov 2015 00:22:39 +0000 (01:22 +0100)]
Add copyright and license to HTTP upload modules

9 years agomod_client_state: Add my email address to header
Holger Weiss [Wed, 4 Nov 2015 00:19:19 +0000 (01:19 +0100)]
mod_client_state: Add my email address to header

9 years agoFaster string_to_jid/1 implementation
Paweł Chmielowski [Tue, 3 Nov 2015 13:40:52 +0000 (14:40 +0100)]
Faster string_to_jid/1 implementation

This version is about 10-15% faster than old one

9 years agomod_http_upload_quota: Omit info message
Holger Weiss [Mon, 2 Nov 2015 23:00:44 +0000 (00:00 +0100)]
mod_http_upload_quota: Omit info message

The mod_http_upload_quota module attempts to delete a directory whenever
it removes a file from that directory.  However, if thumbnail creation
is enabled, directories will often contain two files.  Therefore, don't
log an info (but only a debug) message if directory removal fails.

9 years agomod_http_upload: Don't complain during shutdown
Holger Weiss [Mon, 2 Nov 2015 22:46:58 +0000 (23:46 +0100)]
mod_http_upload: Don't complain during shutdown

Ignore the case where, for some reason, no process is found to be
stopped.

Closes #810.

9 years agomod_http_upload: Use binary strings in most places
Holger Weiss [Mon, 2 Nov 2015 22:46:31 +0000 (23:46 +0100)]
mod_http_upload: Use binary strings in most places

Switch to binary strings to fix a type issue, and for consistency.

Closes #808.

9 years agomod_http_upload: Check availability of ImageMagick
Holger Weiss [Mon, 2 Nov 2015 00:12:10 +0000 (01:12 +0100)]
mod_http_upload: Check availability of ImageMagick

Log an error message during startup if the thumbnail option is enabled
but ImageMagick is not installed.

9 years agomod_http_upload: Suppress error on non-image files
Holger Weiss [Sun, 1 Nov 2015 22:29:22 +0000 (23:29 +0100)]
mod_http_upload: Suppress error on non-image files

Don't log an error (but only a debug) message if ImageMagick fails to
indentify the file type for thumbnail creation.  The image might be
encrypted, or it could be a non-image file.

Closes #809.

9 years agoMerge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Fri, 30 Oct 2015 14:20:50 +0000 (17:20 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

9 years agoFix ipv6 configuration processing (#803)
Evgeniy Khramtsov [Fri, 30 Oct 2015 14:20:15 +0000 (17:20 +0300)]
Fix ipv6 configuration processing (#803)

9 years agoMerge pull request #801 from nanoz/patch-1
Paweł Chmielowski [Thu, 29 Oct 2015 18:46:18 +0000 (19:46 +0100)]
Merge pull request #801 from nanoz/patch-1

feat(ejabberdctl): Foreground option for docker