paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Update] Use correct subnet for IPv6, allow --ours parameter to merge by gits ours strategy 

[Update/config] Allow to set SNAT_TO_SOURCE
master
andre.peters 2018-02-01 13:32:28 +01:00
parent 875b929405
commit 90fe52cc72
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
generate_config.sh
View File

@ -87,12 +87,10 @@ ADDITIONAL_SAN=
# Skip running ACME (acme-mailcow, Let's Encrypt certs) - y/n # Skip running ACME (acme-mailcow, Let's Encrypt certs) - y/n
SKIP_LETS_ENCRYPT=n SKIP_LETS_ENCRYPT=n
# Skip IPv4 check in ACME container - y/n # Skip IPv4 check in ACME container - y/n
SKIP_IP_CHECK=n SKIP_IP_CHECK=n
# Skip Fail2ban implementation (fail2ban-mailcow) - y/n
SKIP_FAIL2BAN=n
# Skip ClamAV (clamd-mailcow) anti-virus (Rspamd will auto-detect a missing ClamAV container) - y/n # Skip ClamAV (clamd-mailcow) anti-virus (Rspamd will auto-detect a missing ClamAV container) - y/n
SKIP_CLAMD=n SKIP_CLAMD=n
@ -107,7 +105,7 @@ LOG_LINES=9999
# Internal IPv4 /24 subnet, format n.n.n. (expands to n.n.n.0/24) # Internal IPv4 /24 subnet, format n.n.n. (expands to n.n.n.0/24)
IPV4_NETWORK=172.22.1 IPV4_NETWORK=172.22.1
# Internal IPv6 subnet in fd00::/8 # Internal IPv6 subnet in fc00::/7
IPV6_NETWORK=fd4d:6169:6c63:6f77::/64 IPV6_NETWORK=fd4d:6169:6c63:6f77::/64

3
update.sh
View File

@ -40,7 +40,6 @@ CONFIG_ARRAY=(
"WATCHDOG_NOTIFY_EMAIL" "WATCHDOG_NOTIFY_EMAIL"
"SKIP_CLAMD" "SKIP_CLAMD"
"SKIP_IP_CHECK" "SKIP_IP_CHECK"
"SKIP_NETFILTER"
"ADDITIONAL_SAN" "ADDITIONAL_SAN"
"DOVEADM_PORT" "DOVEADM_PORT"
"IPV4_NETWORK" "IPV4_NETWORK"
@ -101,8 +100,6 @@ for option in ${CONFIG_ARRAY[@]}; do
fi fi
done done
sed -i 's#SKIP_FAIL2BAN#SKIP_NETFILTER#g' mailcow.conf
echo -en "Checking internet connection... " echo -en "Checking internet connection... "
curl -o /dev/null google.com -sm3 curl -o /dev/null google.com -sm3
if [[ $? != 0 ]]; then if [[ $? != 0 ]]; then