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

[Update/config] Allow to set SNAT_TO_SOURCE

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