99 Commits

Author	SHA1	Message	Date
Licaon_Kter	4c06f13d18	Remove vcard search default value	2018-07-08 23:48:08 +00:00
Licaon_Kter	b7f62a4fa7	Remove stats and time from template ... Are these important for a new admin?	2018-07-06 01:33:41 +00:00
Evgeniy Khramtsov	fbf6ba2738	Merge branch 'master' of github.com:processone/ejabberd	2018-07-02 01:08:09 +03:00
Evgeniy Khramtsov	38ec3f66c7	Enable Roster Versioning in the default config file	2018-07-02 01:08:02 +03:00
Licaon_Kter	7c5ee93c88	Default config example fix reversed text ... ...in enable OMEMO	2018-07-01 21:18:18 +00:00
Evgeniy Khramtsov	77163c43d2	Simplify the default configuration file ... After some discussion with the community it was decided to clean the configuration file from excessive comments and explicitly configured default values. Also, mod_mam and mod_http_upload have been added. The rationale for this is to have a clean and not bloated configuration file which doesn't scare away newcomers and which has all features from the Compliance Suite 2018 (XEP-0387) enabled by default. For further configuration an admin is encouraged to read the documentation at https://docs.ejabberd.im/admin/configuration	2018-07-01 23:57:27 +03:00
Evgeniy Khramtsov	3a5d2dbed8	Move mod_irc to ejabberd-contrib	2018-06-20 12:27:44 +03:00
imShara	815b95c623	OMEMO enable HOWTO added ... Depend on #2425	2018-06-06 20:03:42 +03:00
Licaon_Kter	2c18f89d5b	Add default_db in the example config ... I only found it in the docs after setting up per module db_	2018-05-28 13:19:59 +00:00
Evgeniy Khramtsov	3ac1675919	Option watchdog_admins has no effect anymore	2018-05-08 23:47:37 +03:00
Romain DEP.	2bb6782bee	config: move section about direct-tls for c2s just under regular c2s config (to ease parameters comparison)	2018-03-28 23:17:43 +02:00
Evgeniy Khramtsov	75450a62b3	Clarify the statement about mod_http_upload thumbnails	2018-03-23 16:19:13 +03:00
Evgeniy Khramtsov	a15039638b	Force node config for bookmarks	2018-03-23 16:16:27 +03:00
Evgeniy Khramtsov	55604b2d97	Move force_node_config defaults into ejabberd.yml.example	2018-03-23 16:08:12 +03:00
Alexey Shchepin	e15595df64	Add 'new_sql_schema' config option, --enable-new-sql-schema now sets its default value to true (#2239)	2018-03-15 17:55:05 +03:00
Evgeniy Khramtsov	b179874ec6	Add mod_fail2ban to the example config	2018-03-10 21:41:55 +03:00
Evgeniy Khramtsov	0f86559d83	Always build eimp dependency ... Even if no suitable C graphics libraries are detected at compile time, the package is still usable because it provides `eimp:get_type/1` which is used by mod_avatar.	2018-01-15 12:54:57 +03:00
Licaon_Kter	84819ba0fe	Fix example config macro names ... These were missed in c26b56679e (diff-19e0c10699732f76181f70cfbec95d38) I guess.	2018-01-13 21:38:01 +00:00
Evgeniy Khramtsov	1c1b12fc64	Note about direct-tls connections in example config	2018-01-12 10:27:33 +03:00
Christophe Romain	1fac3e58b3	Fix indentation in commented example	2018-01-10 11:24:09 +01:00
Evgeniy Khramtsov	ee23b688a7	Use TLS defaults from fast_tls	2018-01-06 13:46:02 +03:00
Christophe Romain	a8c3ed5ed4	Remove obsolete option	2017-12-26 11:13:47 +01:00
Christophe Romain	47f6fc8dd2	Revert removal of certfile option on http listener	2017-12-11 11:00:24 +01:00
Christophe Romain	42b2e6c5ab	Update example configuration	2017-12-11 10:27:48 +01:00
Evgeniy Khramtsov	a820d735c0	Replace s2s_cafile with ca_file in ejabberd.yml.example	2017-12-07 14:58:58 +03:00
Christophe Romain	cf8e70abc8	Fix minor typo in comment	2017-11-24 17:17:48 +01:00
Evgeniy Khramtsov	6a0e24fb14	Update URL to IM Observatory	2017-11-20 15:07:06 +03:00
Evgeniy Khramtsov	e9e56ed183	Add notes about s2s_cafile	2017-11-20 15:02:24 +03:00
Evgeniy Khramtsov	c26b56679e	Modernize the example config a bit	2017-11-20 13:34:16 +03:00
Evgeniy Khramtsov	11ee896f10	Improve ACME description	2017-11-15 12:57:53 +03:00
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