From a1baf2112bc03202a0b5590e1b370230b4e7eb44 Mon Sep 17 00:00:00 2001 From: andryyy Date: Wed, 30 Jan 2019 23:03:58 +0100 Subject: [PATCH] [Update] Do not move files before git merge --- update.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/update.sh b/update.sh index 0b1e5325..fe35387a 100755 --- a/update.sh +++ b/update.sh @@ -278,14 +278,6 @@ echo -e "Stopping mailcow... " sleep 2 docker-compose down -# Fix Rspamd maps -if [ -f data/conf/rspamd/custom/global_from_blacklist.map ]; then - mv data/conf/rspamd/custom/global_from_blacklist.map data/conf/rspamd/custom/global_smtp_from_blacklist.map -fi -if [ -f data/conf/rspamd/custom/global_from_whitelist.map ]; then - mv data/conf/rspamd/custom/global_from_whitelist.map data/conf/rspamd/custom/global_smtp_from_whitelist.map -fi - # Silently fixing remote url from andryyy to mailcow git remote set-url origin https://github.com/mailcow/mailcow-dockerized echo -e "\e[32mCommitting current status...\e[0m" @@ -374,6 +366,14 @@ echo "Setting Nextcloud Redis timeout to 0.0..." docker exec -it -u www-data $(docker ps -f name=php-fpm-mailcow -q) bash -c "/web/nextcloud/occ config:system:set redis timeout --value=0.0 --type=integer" fi +# Fix Rspamd maps +if [ -f data/conf/rspamd/custom/global_from_blacklist.map ]; then + mv data/conf/rspamd/custom/global_from_blacklist.map data/conf/rspamd/custom/global_smtp_from_blacklist.map +fi +if [ -f data/conf/rspamd/custom/global_from_whitelist.map ]; then + mv data/conf/rspamd/custom/global_from_whitelist.map data/conf/rspamd/custom/global_smtp_from_whitelist.map +fi + echo -e "\e[32mStarting mailcow...\e[0m" sleep 2 docker-compose up -d --remove-orphans