]>
granicus.if.org Git - ejabberd/log
Christophe Romain [Fri, 7 Apr 2017 08:04:38 +0000 (10:04 +0200)]
Merge pull request #1660 from michal800106/master
Fix order of starting supervisors.
Evgeniy Khramtsov [Fri, 7 Apr 2017 06:10:33 +0000 (09:10 +0300)]
Improve logging of Redis errors
Evgeniy Khramtsov [Thu, 6 Apr 2017 17:56:46 +0000 (20:56 +0300)]
Improve type specs and return values
Evgeniy Khramtsov [Thu, 6 Apr 2017 14:56:37 +0000 (17:56 +0300)]
Add Redis pool support
Fixes #1624
Christophe Romain [Thu, 6 Apr 2017 13:35:02 +0000 (15:35 +0200)]
Set default prefix to /usr/local
michal [Thu, 6 Apr 2017 06:50:23 +0000 (08:50 +0200)]
Fix order of starting supervisors.
ExtMod should be loaded before GenModSupervisor because ext_mod adds proper paths to ebin from modules (ejabberd-contrib).
Without this change you have to add -pa parameter with path to module's ebin.
Evgeniy Khramtsov [Wed, 5 Apr 2017 12:19:00 +0000 (15:19 +0300)]
Add description to feature-not-implemented error
Evgeniy Khramtsov [Wed, 5 Apr 2017 12:10:18 +0000 (15:10 +0300)]
Set 'read_concurrency' for some ETS tables
Evgeniy Khramtsov [Wed, 5 Apr 2017 07:42:42 +0000 (10:42 +0300)]
Don't misuse monotonic_time/0
Christophe Romain [Tue, 4 Apr 2017 15:02:15 +0000 (17:02 +0200)]
Disable mix tests
Evgeniy Khramtsov [Tue, 4 Apr 2017 14:14:24 +0000 (17:14 +0300)]
Don't log warning on successful ping reply
Evgeniy Khramtsov [Tue, 4 Apr 2017 06:53:45 +0000 (09:53 +0300)]
Merge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Tue, 4 Apr 2017 06:52:42 +0000 (09:52 +0300)]
Fix c2s connection close on demand
Fixes #1652
Alexey Shchepin [Mon, 3 Apr 2017 13:30:02 +0000 (16:30 +0300)]
Forget prepared SQL queries on database connect (#1325)
Christophe Romain [Mon, 3 Apr 2017 10:13:03 +0000 (12:13 +0200)]
Always init pubsub_index when using mnesia
Alexey Shchepin [Mon, 3 Apr 2017 09:57:23 +0000 (12:57 +0300)]
Change mnesia dir detection
Christophe Romain [Mon, 3 Apr 2017 09:32:13 +0000 (11:32 +0200)]
Remove obsolete mnesia migration calls
Now that plugins directly use ejabberd_mnesia and can include their own
transform handler, we don't need pubsub_migrate anymore.
People upgrading from 2.1.1x version must upgrade to 17.01 first.
pubsub_migrate module remains to support any manual process requiring it
Evgeniy Khramtsov [Sun, 2 Apr 2017 08:56:09 +0000 (11:56 +0300)]
Improve redis related code
Evgeniy Khramtsov [Fri, 31 Mar 2017 16:10:07 +0000 (19:10 +0300)]
Use ejabberd_sql:abort/1 instead of exit/1
Evgeniy Khramtsov [Fri, 31 Mar 2017 16:08:16 +0000 (19:08 +0300)]
Merge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Fri, 31 Mar 2017 16:07:56 +0000 (19:07 +0300)]
Add Redis as mod_proxy65 RAM backend
Alexey Shchepin [Fri, 31 Mar 2017 14:37:18 +0000 (17:37 +0300)]
Add ejabberd_sql:abort/1 and ejabberd_sql:restart/1
Evgeniy Khramtsov [Fri, 31 Mar 2017 05:16:28 +0000 (08:16 +0300)]
Add SQL as mod_proxy65 RAM backend
Evgeniy Khramtsov [Thu, 30 Mar 2017 14:51:37 +0000 (17:51 +0300)]
Raise bad_node instead of node_down for consistency reason
Evgeniy Khramtsov [Thu, 30 Mar 2017 14:44:43 +0000 (17:44 +0300)]
Do not duplicate enc_pid/dec_pid functions
Christophe Romain [Thu, 30 Mar 2017 12:28:55 +0000 (14:28 +0200)]
Add missing jlib->aux convertion
Christophe Romain [Thu, 30 Mar 2017 12:26:30 +0000 (14:26 +0200)]
Refactor pubsub's get_last_items
Evgeniy Khramtsov [Thu, 30 Mar 2017 11:17:13 +0000 (14:17 +0300)]
Deprecate jlib.erl in favor of aux.erl
Since the main goal of jlib.erl is lost, all auxiliary functions
are now moved to aux.erl, and the whole jlib.erl is now deprecated.
Christophe Romain [Thu, 30 Mar 2017 10:47:42 +0000 (12:47 +0200)]
Merge pull request #1646 from weiss/custom-headers
Add custom_headers option for ejabberd_http listeners
Evgeniy Khramtsov [Thu, 30 Mar 2017 08:45:09 +0000 (11:45 +0300)]
Add Redis as mod_carboncopy RAM backend
Evgeniy Khramtsov [Thu, 30 Mar 2017 07:31:51 +0000 (10:31 +0300)]
Add SQL as mod_carboncopy RAM backend
Badlop [Wed, 29 Mar 2017 10:41:27 +0000 (12:41 +0200)]
oauth_list_tokens and oauth_revoke_token work only in Mnesia (#1644)
Evgeniy Khramtsov [Wed, 29 Mar 2017 10:20:15 +0000 (13:20 +0300)]
Fix a typo
Evgeniy Khramtsov [Wed, 29 Mar 2017 09:58:01 +0000 (12:58 +0300)]
Add SQL as mod_muc RAM backend
Evgeniy Khramtsov [Tue, 28 Mar 2017 18:12:26 +0000 (21:12 +0300)]
Add Redis as mod_bosh RAM backend
Evgeniy Khramtsov [Tue, 28 Mar 2017 17:33:57 +0000 (20:33 +0300)]
Add SQL as mod_bosh RAM backend
Evgeniy Khramtsov [Tue, 28 Mar 2017 16:34:04 +0000 (19:34 +0300)]
Add Redis as router RAM backend
Christophe Romain [Tue, 28 Mar 2017 14:08:10 +0000 (16:08 +0200)]
Mix needs include path to p1_utils
Evgeniy Khramtsov [Tue, 28 Mar 2017 13:31:37 +0000 (16:31 +0300)]
Add SQL as router RAM backend
Holger Weiss [Mon, 27 Mar 2017 22:03:17 +0000 (00:03 +0200)]
mod_http_upload: Don't add "Server" header line
Administrators can add the "Server" header line using the new listener
option "custom_headers", if desired.
Holger Weiss [Mon, 27 Mar 2017 21:52:49 +0000 (23:52 +0200)]
ejabberd_http: Expand @VERSION@ in custom headers
Let ejabberd_http expand the @VERSION@ keyword to the ejabberd version
if specified in the "custom_headers" listener option.
Closes #1414.
Holger Weiss [Mon, 27 Mar 2017 21:19:11 +0000 (23:19 +0200)]
ejabberd_http: Add "custom_headers" option
If the new listener option "custom_headers" is specified, include those
headers with the HTTP(S) response.
Closes #517.
Christophe Romain [Mon, 27 Mar 2017 14:24:24 +0000 (16:24 +0200)]
Fix PEP issues (#1636)
Evgeniy Khramtsov [Fri, 24 Mar 2017 10:27:56 +0000 (13:27 +0300)]
Merge branch 'new_queue'
Conflicts:
rebar.config
src/mod_muc_admin.erl
Evgeniy Khramtsov [Fri, 24 Mar 2017 08:03:23 +0000 (11:03 +0300)]
Avoid PID collisions
Fixes #1470
Christophe Romain [Thu, 23 Mar 2017 11:20:02 +0000 (12:20 +0100)]
Add inets in included_application for mix
Paweł Chmielowski [Wed, 22 Mar 2017 13:30:04 +0000 (14:30 +0100)]
Expand ejabberd.yml.example by enabling mod_http_api with couple commands
Christophe Romain [Wed, 22 Mar 2017 10:59:39 +0000 (11:59 +0100)]
Update mix dependencies
Christophe Romain [Wed, 22 Mar 2017 09:06:21 +0000 (10:06 +0100)]
Update dependencies
Christophe Romain [Tue, 21 Mar 2017 17:59:12 +0000 (18:59 +0100)]
Update docker files from latest Rafael's changes
Holger Weiss [Tue, 21 Mar 2017 17:35:07 +0000 (18:35 +0100)]
prosody2ejabberd: Fix offline message record type
mod_offline now expects a #message{} rather than an #xmlel{} record.
Holger Weiss [Tue, 21 Mar 2017 17:23:55 +0000 (18:23 +0100)]
prosody2ejabberd: Fix message attribute removal
Actually remove the 'stamp' and 'stamp_legacy' attributes from imported
offline messages as intended.
Paweł Chmielowski [Tue, 21 Mar 2017 14:35:51 +0000 (15:35 +0100)]
Fix crash in mod_muc_admin, we operate on integers here not lists
Alexey Shchepin [Tue, 21 Mar 2017 12:42:24 +0000 (15:42 +0300)]
Don't block contacts with subscription=to in mod_block_strangers (#1609)
Christophe Romain [Tue, 21 Mar 2017 11:45:11 +0000 (12:45 +0100)]
Use item creation date in rsm order (#1516)
Evgeny Khramtsov [Tue, 21 Mar 2017 11:44:29 +0000 (15:44 +0400)]
Merge pull request #1626 from weiss/fix-scram-import
prosody2ejabberd: Fix SCRAM hash conversion
Christophe Romain [Tue, 21 Mar 2017 10:15:01 +0000 (11:15 +0100)]
Replace mod_http_bind by mod_bosh in config example
Evgeniy Khramtsov [Mon, 20 Mar 2017 18:48:31 +0000 (21:48 +0300)]
Remove misleading sentence about s2s dialback
Paweł Chmielowski [Mon, 20 Mar 2017 17:28:40 +0000 (18:28 +0100)]
Resolve vars.config relative to to rebar.config.script
This fixes problem with missing deps in make rel - issue #1615
Christophe Romain [Mon, 20 Mar 2017 15:58:48 +0000 (16:58 +0100)]
Fix compilation with mix (#1588)
Christophe Romain [Mon, 20 Mar 2017 15:26:16 +0000 (16:26 +0100)]
Update mix deps
Christophe Romain [Mon, 20 Mar 2017 14:33:55 +0000 (15:33 +0100)]
Update xmpp and fast_tls versions
Evgeniy Khramtsov [Mon, 20 Mar 2017 11:08:58 +0000 (14:08 +0300)]
Revert "Bump OTP version to 19.3 in Travis config"
This reverts commit
7113f2b8ba73f4f565dd1ce6c482c9f03d2b0858 .
Evgeniy Khramtsov [Mon, 20 Mar 2017 10:49:23 +0000 (13:49 +0300)]
Bump OTP version to 19.3 in Travis config
Evgeniy Khramtsov [Mon, 20 Mar 2017 10:48:17 +0000 (13:48 +0300)]
Remove webtool from erlang.plt creation
Evgeniy Khramtsov [Mon, 20 Mar 2017 06:57:11 +0000 (09:57 +0300)]
Use new xdata compiler API
Evgeniy Khramtsov [Sat, 18 Mar 2017 10:59:24 +0000 (13:59 +0300)]
Better log s2s auth failures when TLS is not available
Evgeniy Khramtsov [Sat, 18 Mar 2017 07:24:42 +0000 (10:24 +0300)]
Log startup time
Evgeny Khramtsov [Fri, 17 Mar 2017 22:40:14 +0000 (02:40 +0400)]
Merge pull request #1617 from edwardchow33/patch-1
Fix wrong parameter values in mod_muc_admin
Edward Chow [Fri, 17 Mar 2017 19:07:23 +0000 (03:07 +0800)]
Fixed wrong parameter values in mod_muc_admin
Corrected wrong parameter values passing to register_online_room(Room, Host, Pid) of mod_muc
Evgeniy Khramtsov [Fri, 17 Mar 2017 18:35:02 +0000 (21:35 +0300)]
Set translation callback on startup
Paweł Chmielowski [Fri, 17 Mar 2017 10:58:32 +0000 (11:58 +0100)]
Teach mod_http_fileserver ability to send 304 Not Modified
Holger Weiss [Thu, 16 Mar 2017 22:15:08 +0000 (23:15 +0100)]
prosody2ejabberd: Fix SCRAM hash conversion
Closes #1549.
Badlop [Wed, 15 Mar 2017 10:42:16 +0000 (11:42 +0100)]
Encode in base64 when getting scram data with import_prosody (#1549)
Evgeniy Khramtsov [Wed, 15 Mar 2017 07:27:22 +0000 (10:27 +0300)]
Use correct pid when registering local route
This fixes #1600
Alexey Shchepin [Tue, 14 Mar 2017 14:25:09 +0000 (17:25 +0300)]
Update cyrsasl_oauth to internal API changes
Alexey Shchepin [Mon, 13 Mar 2017 23:31:51 +0000 (02:31 +0300)]
Get rid of p1_sha calls
Paweł Chmielowski [Mon, 13 Mar 2017 15:41:52 +0000 (16:41 +0100)]
Fix handling of xmlrpc request without authentication structure
This is problem from issue #1602
Badlop [Mon, 13 Mar 2017 10:26:58 +0000 (11:26 +0100)]
In module_install copy also deps/ebin and priv files (ejabberd-contrib#200)
Evgeny Khramtsov [Sun, 12 Mar 2017 14:34:14 +0000 (18:34 +0400)]
Merge pull request #1603 from strugee/patch-1
Note how to apply s2s Access Rights in the example
Evgeniy Khramtsov [Sun, 12 Mar 2017 05:55:54 +0000 (08:55 +0300)]
Return 'closed' instead of 'einval' on closed sockets
Alex Jordan [Sat, 11 Mar 2017 04:53:01 +0000 (23:53 -0500)]
Note how to apply s2s Access Rights in the example
Evgeniy Khramtsov [Fri, 10 Mar 2017 17:21:04 +0000 (20:21 +0300)]
Improve overloaded S2S queue processing
Paweł Chmielowski [Fri, 10 Mar 2017 13:39:47 +0000 (14:39 +0100)]
Teach web admin about ip acl rules
Evgeniy Khramtsov [Fri, 10 Mar 2017 12:12:43 +0000 (15:12 +0300)]
Add support for file-based queues
It's now possible to use files as internal packet queues.
The following options are introduced:
* queue_type: the option can be set to `ram` (default) or `file`.
The option can be set per virtual host.
* queue_dir: path to the directory where queues will be allocated.
The default is 'queue' directory inside Mnesia directory.
This is a global option and cannot be set per virtual host.
Paweł Chmielowski [Fri, 10 Mar 2017 09:33:16 +0000 (10:33 +0100)]
Improve formatting of erlang terms shown in web admin
Badlop [Thu, 9 Mar 2017 18:21:45 +0000 (19:21 +0100)]
Include shared groups also when contact is is personal roster (#1585)
Badlop [Wed, 8 Mar 2017 15:23:01 +0000 (16:23 +0100)]
Remove mod_pubsub from ejd2sql export, as it isn't implemented (#1584)
Badlop [Wed, 8 Mar 2017 15:22:13 +0000 (16:22 +0100)]
Fix handling ejabberd_sql:sql_transaction result (#1584)
Evgeniy Khramtsov [Wed, 8 Mar 2017 05:27:54 +0000 (08:27 +0300)]
Report more TLS errors
Evgeniy Khramtsov [Tue, 7 Mar 2017 19:21:44 +0000 (22:21 +0300)]
Fix typo and spec
Evgeniy Khramtsov [Tue, 7 Mar 2017 18:40:39 +0000 (21:40 +0300)]
Remove forgotten compile_all
Evgeniy Khramtsov [Tue, 7 Mar 2017 15:46:02 +0000 (18:46 +0300)]
Report some TLS errors
Evgeniy Khramtsov [Tue, 7 Mar 2017 15:11:28 +0000 (18:11 +0300)]
Don't call deprecated jid functions from the test suite
Evgeniy Khramtsov [Tue, 7 Mar 2017 11:20:50 +0000 (14:20 +0300)]
Best Practices for Use of SASL EXTERNAL with Certificates (XEP-0178) support
It is now possible for client connections to login using PKIX certificates.
This is disabled by default, to enable it:
- either set 'tls_verify: true' and 'cafile: /path/to/CAfile'
in the corresponding listener's section
- or set equivalent per-vhost options 'c2s_tls_verify' and 'c2s_cafile'
Evgeniy Khramtsov [Thu, 2 Mar 2017 13:02:44 +0000 (16:02 +0300)]
Better handle errors in ejabberd_receiver calls
Evgeniy Khramtsov [Thu, 2 Mar 2017 12:34:26 +0000 (15:34 +0300)]
Fix previous commit
Evgeniy Khramtsov [Thu, 2 Mar 2017 12:30:34 +0000 (15:30 +0300)]
Revert "Remove relict mod_service_log"
This reverts commit
0d4e1abbd11155a1cddbe809ff09183af1427af8 .
However, stanzas are now encapsulated into forwarded element
(as per XEP-0297) instead of <route/> nonza.
Evgeniy Khramtsov [Wed, 1 Mar 2017 12:23:22 +0000 (15:23 +0300)]
Improve reporting of unavailable SASL mechanisms
Evgeniy Khramtsov [Wed, 1 Mar 2017 11:37:35 +0000 (14:37 +0300)]
Resolve all addresses from SRV lookup