external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-04 00:17:06 +00:00
Code Issues Releases Wiki Activity

Attempt at dealing with disabled ipv6 on interfaces

Browse Source
This commit is contained in:
downtownallday 2020-06-10 21:56:49 -04:00
parent adf7d3ed8d
commit ae5fbffa40
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
setup/dns.sh
View File

@ -62,12 +62,16 @@ for ip in $PRIVATE_IP $PRIVATE_IPV6; do
echo " ip-address: $ip" >> /etc/nsd/nsd.conf; echo " ip-address: $ip" >> /etc/nsd/nsd.conf;
done done
# Deal with a failure for nsd to start on Travis-CI by disabling ip6 # nsd fails to start when ipv6 is disabled by the kernel on certain
# and setting control-enable to "no". Even though the nsd docs say the # interfaces without "do-ip6" set to "no" and "control-enable" to "no"
# default value for control-enable is no, running "nsd-checkconf -o # [confirm]. Even though the nsd docs say the default value for
# control-enable /etc/nsd/nsd.conf" returns "yes", so we explicitly # control-enable is no, running "nsd-checkconf -o control-enable
# set it here. # /etc/nsd/nsd.conf" returns "yes", so we explicitly set it here.
if [ -z "$PRIVATE_IPV6" -a "${TRAVIS:-}" == "true" ]; then #
# For instance, on Travis-CI, ipv6 is disabled on the lo and docker
# interfaces, but enabled on the primary interface ens4. nsd fails to
# start without these additions.
if kernel_ipv6_lo_disabled; then
cat >> /etc/nsd/nsd.conf <<EOF cat >> /etc/nsd/nsd.conf <<EOF
do-ip4: yes do-ip4: yes
do-ip6: no do-ip6: no

6
setup/functions.sh
View File

@ -235,3 +235,9 @@ function generate_password() {
dd if=/dev/urandom bs=1 count=$input_len 2>/dev/null | base64 --wrap=0 | awk '{ gsub("/", ",", $0); print $0}' dd if=/dev/urandom bs=1 count=$input_len 2>/dev/null | base64 --wrap=0 | awk '{ gsub("/", ",", $0); print $0}'
} }
function kernel_ipv6_lo_disabled() {
# Returns 0 if ipv6 is disabled on the loopback adapter
local v="$(sysctl -n net.ipv6.conf.lo.disable_ipv6)"
[ "$v" == "1" ] && return 0
return 0
}

10
setup/mail-postfix.sh
View File

@ -62,6 +62,16 @@ tools/editconf.py /etc/postfix/main.cf \
smtpd_banner="\$myhostname ESMTP Hi, I'm a Mail-in-a-Box (Ubuntu/Postfix; see https://mailinabox.email/)" \ smtpd_banner="\$myhostname ESMTP Hi, I'm a Mail-in-a-Box (Ubuntu/Postfix; see https://mailinabox.email/)" \
mydestination=localhost mydestination=localhost
# when ipv6 is disabled on the loopback adapter and a mail message
# delivery attempt fails because the recipient doesn't exist, postfix
# returns reason "Host or domain name not found. Name service error
# for name=abc.com type=AAAA: Host not found", instead of the actual
# reason "User doesn't exist." The sysadmin's intent is probably that
# ipv6 is not desired at all, so disable ipv6.
if kernel_ipv6_lo_disabled; then
tools/editconf.py /etc/postfix/main.cf inet_protocols=ipv4
fi
# Tweak some queue settings: # Tweak some queue settings:
# * Inform users when their e-mail delivery is delayed more than 3 hours (default is not to warn). # * Inform users when their e-mail delivery is delayed more than 3 hours (default is not to warn).
# * Stop trying to send an undeliverable e-mail after 2 days (instead of 5), and for bounce messages just try for 1 day. # * Stop trying to send an undeliverable e-mail after 2 days (instead of 5), and for bounce messages just try for 1 day.