Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00
Code Releases Activity

Deprecate s2s_use_starttls: required_trusted

Browse Source 
The functionality can be now obtained by using
`s2s_use_starttls: required` with `mod_s2s_dialback`
being unloaded.
This commit is contained in:
Evgeniy Khramtsov 2017-09-02 11:44:11 +03:00
parent 7566d254e4
commit 2acbf4625b
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ejabberd.yml.example
View File

@ -231,7 +231,7 @@ listen:
## ##
## s2s_use_starttls: Enable STARTTLS for S2S connections. ## s2s_use_starttls: Enable STARTTLS for S2S connections.
## Allowed values are: false optional required required_trusted ## Allowed values are: false, optional or required
## You must specify a certificate file. ## You must specify a certificate file.
## ##
## s2s_use_starttls: required ## s2s_use_starttls: required

8
src/ejabberd_s2s.erl
View File

@ -726,7 +726,13 @@ opt_type(s2s_use_starttls) ->
(false) -> false; (false) -> false;
(optional) -> optional; (optional) -> optional;
(required) -> required; (required) -> required;
(required_trusted) -> required_trusted (required_trusted) ->
?WARNING_MSG("The value 'required_trusted' of option "
"'s2s_use_starttls' is deprected and will be "
"unsupported in future releases. Instead, "
"set it to 'required' and make sure "
"mod_s2s_dialback is *NOT* loaded", []),
required_trusted
end; end;
opt_type(s2s_zlib) -> opt_type(s2s_zlib) ->
fun(B) when is_boolean(B) -> B end; fun(B) when is_boolean(B) -> B end;