dynamic ip and mail port updates

[distro-setup] / mail-setup

diff --git a/mail-setup b/mail-setup
index babbbd8dc3668c428167f8d3adae9d17bc6aa0a8..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
@@ -644,6 +644,9 @@ EOF
     # would be unused in that config type.
     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