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

Improve explanations of cafile options

Browse Source
This commit is contained in:
Badlop 2020-07-31 17:35:24 +02:00
parent b109c5927e
commit 4a54395561
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/ejabberd_options_doc.erl
View File

@ -386,11 +386,14 @@ doc() ->
{c2s_cafile, {c2s_cafile,
#{value => ?T("Path"), #{value => ?T("Path"),
desc => desc =>
?T("Full path to a file containing one or more CA certificates " [?T("Full path to a file containing one or more CA certificates "
"in PEM format. All client certificates should be signed by " "in PEM format. All client certificates should be signed by "
"one of these root CA certificates and should contain the " "one of these root CA certificates and should contain the "
"corresponding JID(s) in subjectAltName field. " "corresponding JID(s) in 'subjectAltName' field. "
"There is no default value.")}}, "There is no default value."), "",
?T("You can use http://../toplevel/#host-config[host_config] to specify this option per-vhost."), "",
?T("To set a specific file per listener, use the listener's http://../listen-options/#cafile[cafile] option. Please notice that 'c2s_cafile' overrides the listener's 'cafile' option."), ""
]}},
{c2s_ciphers, {c2s_ciphers,
#{value => "[Cipher, ...]", #{value => "[Cipher, ...]",
desc => desc =>
@ -431,8 +434,10 @@ doc() ->
{ca_file, {ca_file,
#{value => ?T("Path"), #{value => ?T("Path"),
desc => desc =>
?T("Path to a file of CA root certificates. " [?T("Path to a file of CA root certificates. "
"The default is to use system defined file if possible.")}}, "The default is to use system defined file if possible."), "",
?T("For server conections, this 'ca_file' option is overriden by the http://../toplevel/#s2s-cafile[s2s_cafile] option."), ""
]}},
{captcha_cmd, {captcha_cmd,
#{value => ?T("Path"), #{value => ?T("Path"),
desc => desc =>
@ -1048,9 +1053,11 @@ doc() ->
{s2s_cafile, {s2s_cafile,
#{value => ?T("Path"), #{value => ?T("Path"),
desc => desc =>
?T("A path to a file with CA root certificates that will " [?T("A path to a file with CA root certificates that will "
"be used to authenticate s2s connections. If not set " "be used to authenticate s2s connections. If not set, "
"the value of 'ca_file' will be used.")}}, "the value of http://../toplevel/#ca-file[ca_file] will be used."), "",
?T("You can use http://../toplevel/#host-config[host_config] to specify this option per-vhost."), ""
]}},
{s2s_ciphers, {s2s_ciphers,
#{value => "[Cipher, ...]", #{value => "[Cipher, ...]",
desc => desc =>