fix ssh issue, various minor improvements

[distro-setup] / mail-setup

diff --git a/mail-setup b/mail-setup
index cfe5575d2090ebfcc120f39575c0aa40e5d8060c..e7020d74361301bf5c7b3d82f109b367014fa6cf 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -4,12 +4,17 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 # Things I tend to forget. on MAIL_HOST, daemon runs with /etc/exim4/my.conf,
-# which gets generated from update-exim4.conf -d /etc/myexim4
+# due to /etc/default/exim4 containing:
+# COMMONOPTIONS='-C /etc/exim4/my.conf'
+# UPEX4OPTS='-o /etc/exim4/my.conf'
+#
+# The non-daemon config
+# gets generated from this script calling update-exim4.conf -d /etc/myexim4
 # which has log path
 # log_file_path = /var/log/exim4/my%s
 #
-# so, normal mainlog is non-daemon, which delivers to the daemon.
-
+# eximbackup folder is /bu/md
+# it is cleaned up by mail-backup-clean, which is run by btrbk-run
 
 # shellcheck disable=SC2254 # makes for a lot of unneeded quotes
 
@@ -3337,7 +3342,6 @@ sentarchive:
   unseen
 EOF
 
-
     u /etc/myexim4/conf.d/router/160_backup_redir <<'EOF'
 backup_redir:
 driver = redirect
@@ -3354,8 +3358,6 @@ unseen = true
 errors_to = alerts@iankelling.org
 EOF
 
-
-
     # for bk, we have a exim4in.service that will do this for us.
     m update-exim4.conf -d /etc/myexim4
     ;;