minor improvements

[distro-setup] / mail-setup

diff --git a/mail-setup b/mail-setup
index 83ae53c1b2fb8c9e402208d77d9610ff875b4242..930ddcca0edd3b4d5dfd2d88c9e4407e3f006fad 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -345,6 +345,12 @@ EOF
 
     # most of these settings get translated into settings
     # in /etc/exim4/update-exim4.conf.conf
+    # how /etc/exim4/update-exim4.conf.conf translates into actual exim settings is
+    # documented in man update-exim4.conf, which outputs to the config that
+    # exim actually reads. except the man page is not perfect, for example,
+    # it doesn't document that it sets
+    # DCconfig_${dc_eximconfig_configtype}" "1"
+    # which is a line from update-exim4.conf, which is a relatively short bash script.
     # mailname setting sets /etc/mailname
 
     debconf-set-selections <<EOF
@@ -844,6 +850,28 @@ dovecot_lmtp:
         batch_max = 200
 EOF
 
+    cat >/etc/exim4/conf.d/router/190_exim4-config_fsfsmarthost <<'EOF'
+# smarthost for fsf mail
+# ian: copied from /etc/exim4/conf.d/router/200_exim4-config_primary, and added senders = and
+# replaced DCsmarthost with mail.fsf.org
+fsfsmarthost:
+  debug_print = "R: smarthost for $local_part@$domain"
+  driver = manualroute
+  domains = ! +local_domains
+  senders = *@fsf.org
+  transport = remote_smtp_smarthost
+  route_list = * mail.fsf.org byname
+  host_find_failed = ignore
+  same_domain_copy_routing = yes
+  no_more
+EOF
+
+    # https://blog.dhampir.no/content/make-exim4-on-debian-respect-forward-and-etcaliases-when-using-a-smarthost
+    # i only need .forwards, so just doing that one.
+    cd /etc/exim4/conf.d/router
+    b=userforward_higher_priority
+    # replace the router name so it is unique
+    sed -r s/^\\S+:/$b:/ 600_exim4-config_userforward >175_$b
 
     # begin setup passwd.client
     f=/etc/exim4/passwd.client
@@ -855,12 +883,6 @@ EOF
     done
     # end setup passwd.client
 
-    # https://blog.dhampir.no/content/make-exim4-on-debian-respect-forward-and-etcaliases-when-using-a-smarthost
-    # i only need .forwards, so just doing that one.
-    cd /etc/exim4/conf.d/router
-    b=userforward_higher_priority
-    # replace the router name so it is unique
-    sed -r s/^\\S+:/$b:/ 600_exim4-config_userforward >175_$b
     systemctl restart exim4
 
 fi  #### end if exim4
@@ -905,11 +927,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