btrbk improvements for cron

[distro-setup] / mail-setup

diff --git a/mail-setup b/mail-setup
index c1db3c7fc8bbd9697cfc3b9bf29c83ed7667d356..f43b6ba8b136ab697a19b210c5fd10b1109c87e9 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -205,7 +205,7 @@ pi() { # package install
 
 postmaster=$u
 mxhost=mail.iankelling.org
-mxport=25
+mxport=587
 forward=$u@$mxhost
 
 # old setup. left as comment for example
@@ -642,7 +642,11 @@ EOF
     # MAIN_HARDCODE_PRIMARY_HOSTNAME might mess up the
     # smarthost config type, not sure. all other settings
     # would be unused in that config type.
-    cat >/etc/exim4/conf.d/main/000_localmacros <<EOF
+    rm -f /etc/exim4/conf.d/main/000_localmacros # old filename
+    cat >/etc/exim4/conf.d/main/000_local <<EOF
+# enable 587 in addition to the default 25, so that
+# i can send mail where port 25 is firewalled by isp
+daemon_smtp_ports = 25 : 587
 # i don't have ipv6 setup for my vpn tunnel yet.
 disable_ipv6 = true