From 25ddd7b1526556c6994f0705b70f0aca23686e58 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Mon, 15 Nov 2021 14:55:26 +0000 Subject: [PATCH] Changed default outgoing_s2s_families to IPv6 as servers are within datacenters where IPv6 is more commonly enabled (contrary to clients), and if it's not present - it'll just fall back to IPv4. --- man/ejabberd.yml.5 | 6 +++--- src/ejabberd_options.erl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/man/ejabberd.yml.5 b/man/ejabberd.yml.5 index a14a5c730..b760c5af4 100644 --- a/man/ejabberd.yml.5 +++ b/man/ejabberd.yml.5 @@ -1203,11 +1203,11 @@ option)\&. Later, when memory drops below this percents\&. .RE .PP -\fBoutgoing_s2s_families\fR: \fI[ipv4 | ipv6, \&.\&.\&.]\fR +\fBoutgoing_s2s_families\fR: \fI[ipv6 | ipv4, \&.\&.\&.]\fR .RS 4 Specify which address families to try, in what order\&. The default is -\fI[ipv4, ipv6]\fR -which means it first tries connecting with IPv4, if that fails it tries using IPv6\&. +\fI[ipv6, ipv4]\fR +which means it first tries connecting with IPv6, if that fails it tries using IPv4\&. .RE .sp \fINote\fR about the next option: added in 20\&.12: diff --git a/src/ejabberd_options.erl b/src/ejabberd_options.erl index 345dd3890..0e5bc1100 100644 --- a/src/ejabberd_options.erl +++ b/src/ejabberd_options.erl @@ -614,7 +614,7 @@ options() -> {oom_killer, true}, {oom_queue, 10000}, {oom_watermark, 80}, - {outgoing_s2s_families, [inet, inet6]}, + {outgoing_s2s_families, [inet6, inet]}, {outgoing_s2s_ipv4_address, undefined}, {outgoing_s2s_ipv6_address, undefined}, {outgoing_s2s_port, 5269},