lots of fixes and improvements

[distro-setup] / mail-setup

diff --git a/mail-setup b/mail-setup
index 83ae53c1b2fb8c9e402208d77d9610ff875b4242..d6ba6f7f7b07ef24b90d6e2a16cfdb0b61c6c37d 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -905,11 +905,19 @@ if dpkg -s radicale &>/dev/null; then
     if [[ $HOSTNAME == $MAIL_HOST ]]; then
         systemctl restart radicale
         systemctl enable radicale
+        if [[ -e /etc/logrotate.d/radicale.disabled ]]; then
+            mv /etc/logrotate.d/radicale{.disabled,}
+        fi
     else
         systemctl stop radicale
         systemctl disable radicale
+        # weekly logrotate tries to restart radicale even if it's a disabled service in flidas.
+        if [[ -e /etc/logrotate.d/radicale ]]; then
+            mv /etc/logrotate.d/radicale{,.disabled}
+        fi
     fi
 fi
+exit 0
 
 # if I wanted the from address to be renamed and sent to a different address,
 # echo "sdx@localhost development@localhost" | sudo dd of=/etc/postfix/recipient_canonical