fix postfix

diff --git a/distro-end b/distro-end
index ea99357c14cad178f563bc17641b76f139920e91..2c638206b74f85476ce892899b7c0b49e377019c 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -70,6 +70,7 @@ case $HOSTNAME in
             jq
             locate
             meld
+            nmap
             offlineimap
             p7zip
             paprefs

diff --git a/postfix-setup b/postfix-setup
index 7953865b3fb8de01e55b059e4c7ceef05a94306c..2ecbd6b4be047c8ce90c4c6ef8471fbe90f165bf 100755 (executable)
--- a/postfix-setup
+++ b/postfix-setup
@@ -77,9 +77,9 @@ fi
 # it might work in /etc/aliases, but this seems more proper.
 
 if s grep amazonaws /etc/postfix/sasl_passwd &>/dev/null; then
-    forward=$HOSTNAME@$PERSONAL_DOMAIN
-else
     forward=$HOSTNAME@$IMPERSONAL_DOMAIN
+else
+    forward=$HOSTNAME@$PERSONAL_DOMAIN
 fi
 e $forward > ~/.forward
 e $forward | s tee /root/.forward
@@ -99,8 +99,12 @@ smtp_sasl_security_options = noanonymous
 smtp_tls_security_level = secure
 message_size_limit =  20480000
 smtp_tls_CAfile = /etc/ssl/certs/ca-certificates.crt
+inet_protocols = ipv4
 EOF
-# ^ I ran into a log file not sending cuz of size. double from 10 to 20 meg limit
+# msg_size_limit: I ran into a log file not sending cuz of size. double from 10 to 20 meg limit
+# inet_protocols: without this, postfix tries an ipv6 lookup then gives
+# up and fails. snippet from syslog: type=AAAA: Host not found, try again
+
 
 s postmap hash:/etc/postfix/sasl_passwd
 # offlineimap uses this too, it is much easier to use one location than to