diff --git a/generate_config.sh b/generate_config.sh index 5b2d23f42..280d66c78 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -87,12 +87,10 @@ ADDITIONAL_SAN= # Skip running ACME (acme-mailcow, Let's Encrypt certs) - y/n SKIP_LETS_ENCRYPT=n + # Skip IPv4 check in ACME container - y/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_CLAMD=n @@ -107,7 +105,7 @@ LOG_LINES=9999 # Internal IPv4 /24 subnet, format n.n.n. (expands to n.n.n.0/24) IPV4_NETWORK=172.22.1 -# Internal IPv6 subnet in fd00::/8 +# Internal IPv6 subnet in fc00::/7 IPV6_NETWORK=fd4d:6169:6c63:6f77::/64 diff --git a/update.sh b/update.sh index 3054e7577..d541e6838 100755 --- a/update.sh +++ b/update.sh @@ -40,7 +40,6 @@ CONFIG_ARRAY=( "WATCHDOG_NOTIFY_EMAIL" "SKIP_CLAMD" "SKIP_IP_CHECK" - "SKIP_NETFILTER" "ADDITIONAL_SAN" "DOVEADM_PORT" "IPV4_NETWORK" @@ -101,8 +100,6 @@ for option in ${CONFIG_ARRAY[@]}; do fi done -sed -i 's#SKIP_FAIL2BAN#SKIP_NETFILTER#g' mailcow.conf - echo -en "Checking internet connection... " curl -o /dev/null google.com -sm3 if [[ $? != 0 ]]; then