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

Merge branch 'master' into staging

master
andryyy 2021-09-01 13:36:53 +02:00
parent 19dda55d96 c554fa9363
commit 853a281993
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
update.sh
View File

@ -169,11 +169,16 @@ migrate_docker_nat() {
echo "Working on IPv6 NAT, please wait..." echo "Working on IPv6 NAT, please wait..."
echo ${NAT_CONFIG} > /etc/docker/daemon.json echo ${NAT_CONFIG} > /etc/docker/daemon.json
ip6tables -F -t nat ip6tables -F -t nat
if ! systemctl restart docker.service; then [[ -e /etc/alpine-release ]] && rc-service docker restart || systemctl restart docker.service
if [[ $? -ne 0 ]]; then
echo -e "\e[31mError:\e[0m Failed to activate IPv6 NAT! Reverting and exiting." echo -e "\e[31mError:\e[0m Failed to activate IPv6 NAT! Reverting and exiting."
rm /etc/docker/daemon.json rm /etc/docker/daemon.json
if [[ -e /etc/alpine-release ]]; then
rc-service docker restart
else
systemctl reset-failed docker.service systemctl reset-failed docker.service
systemctl restart docker.service systemctl restart docker.service
fi
return 1 return 1
fi fi
fi fi