Evgeniy Khramtsov
b04c6b7d75
Merge branch 'lets_encrypt_acme_support' of git://github.com/angelhof/ejabberd into angelhof-lets_encrypt_acme_support
...
Conflicts:
rebar.config
src/ejabberd_pkix.erl
2017-11-15 10:01:30 +03:00
Konstantinos Kallas
ce99db0595
Explain what is needed for the acme configuration and other small changes
...
1. Add a request handler in ejabberd_http and explain how to configure the http listener so that the challenges can be solved.
2. Make acme configuration optional by providing defaults in ejabberd_acme.
3. Save the CA that the account has been created in so that it creates a new account when connecting to a new CA.
4. Small spec change in acme configuration.
2017-11-14 14:12:33 +02:00
Konstantinos Kallas
78f494dd2e
Configuration file changes
...
Explain the acme configuration options
2017-11-11 15:38:47 +02:00
Evgeniy Khramtsov
35b7203e01
Introduce 'certfiles' global option
...
The option is supposed to replace existing options 'c2s_certfile',
's2s_certfile' and 'domain_certfile'. The option accepts a list
of file paths (optionally with wildcards "*") containing either
PEM certificates or PEM private keys. At startup, ejabberd sorts
the certificates, finds matching private keys and rebuilds full
certificates chains which can be used by fast_tls. Example:
certfiles:
- "/etc/letsencrypt/live/example.org/*.pem"
- "/etc/letsencrypt/live/example.com/*.pem"
2017-11-01 00:20:27 +03:00
Evgeny Khramtsov
2aeee9eab4
Merge pull request #2028 from weiss/increase-queue-sizes
...
Increase max_fsm_queue and max_ack_queue sizes
2017-10-29 12:18:23 +04:00
Holger Weiss
79685da90b
Increase 'max_fsm_queue' default
...
The old default was becoming too small for some workloads.
2017-10-03 01:29:52 +02:00
Romain DEP.
a7341957f2
config: makes line endings consistent when followed by '-'
2017-09-30 11:12:20 +02:00
Romain DEP.
2cb0cedc6b
config: makes line endings consistent when followed by ':'
2017-09-30 11:10:34 +02:00
Evgeniy Khramtsov
30e5c9bd3e
Add mod_avatar to the example configuration
2017-09-25 16:23:02 +03:00
Badlop
5882c9b456
Add some recommended TLSOPTS as comments in the default config ( #2004 )
2017-09-21 16:28:17 +02:00
Evgeniy Khramtsov
2acbf4625b
Deprecate s2s_use_starttls: required_trusted
...
The functionality can be now obtained by using
`s2s_use_starttls: required` with `mod_s2s_dialback`
being unloaded.
2017-09-02 11:45:06 +03:00
Konstantinos Kallas
37a54cd498
List the possible ca_urls in example config file
2017-08-22 10:38:33 +03:00
Konstantinos Kallas
f581e391ac
Merge remote-tracking branch 'upstream/master'
2017-08-19 13:42:05 +03:00
Konstantinos Kallas
73f0b6707a
Move the ca_url to the config file
2017-08-12 15:59:54 +03:00
Konstantinos Kallas
61d1411ab3
Sync fork with upstream
2017-07-26 09:54:23 +03:00
Holger Weiss
66510c1d78
Add mod_push_keepalive
...
This module tries to keep pending stream management sessions of push
clients alive (as long as the disconnected clients are reachable via
push notifications).
2017-07-21 01:07:36 +02:00
Holger Weiss
d6f1d3df5b
Support XEP-0357: Push Notifications
...
Closes #1379 .
2017-07-20 20:22:50 +02:00
Konstantinos Kallas
77a96b0ec6
Solve acme challenges using built in http server
2017-07-12 19:23:52 +03:00
Konstantinos Kallas
b4b4e247dd
Add the certificate directory in ejabberd.yml.ecample
2017-07-07 19:40:57 +03:00
Konstantinos Kallas
d3c477646f
Add support for command get_certificates, very crude
2017-07-03 13:37:32 +03:00
Mickaël Rémond
bb39ecbc08
More explicit bosh configuration handler
...
I also updated default url from to match URL suggested by XEP-0156
2017-06-23 16:47:14 +02:00
Christophe Romain
a095477b4c
Fix outgoing_s2s_timeout description ( #1684 )
2017-06-21 16:30:51 +02:00
Paweł Chmielowski
8c1568ff93
Add more ipv6 loopback addresses
2017-06-09 14:38:34 +02:00
Paweł Chmielowski
7b5895c90d
Allow api access on both ipv4 and 6 loopback addresses
...
This should fix issue #1769
2017-06-09 13:57:26 +02:00
Christophe Romain
2a6c50832e
Improve S2S examples ( #1583 )
2017-04-07 11:12:27 +02:00
Christophe Romain
d759875db8
Add more examples on config template ( #1583 )
2017-04-07 11:02:11 +02:00
Paweł Chmielowski
cb0627e6b2
Expand ejabberd.yml.example by enabling mod_http_api with couple commands
2017-03-22 14:30:12 +01:00
Christophe Romain
69b52196bd
Replace mod_http_bind by mod_bosh in config example
2017-03-21 11:15:01 +01:00
Evgeniy Khramtsov
f7cb7ef014
Remove misleading sentence about s2s dialback
2017-03-20 21:48:31 +03:00
Alex Jordan
c4ed1c2764
Note how to apply s2s Access Rights in the example
2017-03-10 23:53:01 -05:00
Evgeniy Khramtsov
ac025ee6f2
Clarify new modules usage in the example config
2017-02-27 17:20:04 +03:00
Evgeniy Khramtsov
adbd174959
Rename mod_sm -> mod_stream_mgmt
2017-02-21 09:18:58 +03:00
Evgeniy Khramtsov
d5d906184f
Merge branch 'new_stream'
...
Conflicts:
src/cyrsasl.erl
src/ejabberd_c2s.erl
src/ejabberd_cluster.erl
src/ejabberd_frontend_socket.erl
src/ejabberd_node_groups.erl
src/ejabberd_router.erl
src/mod_bosh.erl
src/mod_ip_blacklist.erl
src/mod_muc_mnesia.erl
src/mod_offline.erl
src/mod_proxy65_sm.erl
2017-01-20 19:35:46 +03:00
Evgeniy Khramtsov
64997d9961
Add mod_sm and mod_s2s_dialback to example config
2017-01-16 10:12:46 +03:00
Paweł Chmielowski
ce42b6be01
Add example api_permisions: definition to config template
...
Also expand default config to have rule for admin oauth
2017-01-13 16:53:48 +01:00
Christophe Romain
af0a493c66
Merge pull request #1253 from Amuhar/xep0356
2016-09-07 14:34:31 +02:00
Paweł Chmielowski
75366ca2fd
Inline muc access rules
2016-06-24 15:12:58 +02:00
Christophe Romain
8583958268
Use shorter jid acl in config template
2016-06-17 11:58:51 +02:00
Paweł Chmielowski
d1425f0d78
Use new short access rules in config template
2016-06-16 11:13:07 +02:00
Paweł Chmielowski
9e68c4c0d9
Convert example config to use new syntax for access rules
2016-05-26 11:08:53 +02:00
Evgeniy Khramtsov
1aae8a9fda
Rename odbc to sql everywhere
2016-04-20 13:25:42 +03:00
Badlop
dc7b2c45c2
Fix indentation of mod_register in default configuration file
2016-03-19 17:42:12 +01:00
Holger Weiss
0d1edc4771
Don't enable in-band registration by default
2016-03-11 12:31:16 +01:00
Badlop
2f9f4e6938
Fix example config about ejabberd_xmlrpc ( #771 )
2015-11-17 21:33:28 +01:00
Badlop
f6d8f47451
Disable vJUD search in the default config and when not specified
2015-11-13 19:30:11 +01:00
Holger Weiss
c0497d46af
mod_client_state: Throttle stanzas by default
...
Enable the mod_client_state options "drop_chat_states" and
"queue_presence" by default. These features are now well-tested in
practice.
2015-08-05 00:05:11 +02:00
Paweł Chmielowski
dcf5aefea0
Add option to set net_ticktime (EJAB-1742)
2015-06-15 14:57:07 +02:00
Badlop
0d322d8dab
Add fold markers to config file for Vim editors
2015-05-22 12:42:24 +02:00
Paweł Chmielowski
ba69c469b5
Remove http_poll module
...
For couple years browsers did limit ability to change cookies from js
for different domains, this made http_poll connections practically not
usuable. I don't think this module is used at all so it's time to put it
to rest.
2015-04-15 10:47:10 +02:00
Paweł Chmielowski
a1f81057ca
Enable websocket connection in default config file
2015-04-15 10:35:17 +02:00
