minor fix + minor changes

diff --git a/mail-setup b/mail-setup
index bdfe29a8949c3229cadfb7b89e7b11343f261554..4a498c5abd25b50d19f70eacd75ebfc4a30b8ae2 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -3,6 +3,13 @@
 # Copyright (C) 2019 Ian Kelling
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
+# todo: for a locally generated message, if we delivery into the network
+# namespace, it goes into the queue, but later fails again with
+# something like "remote host is the localhost".  Of course, we could
+# have a separate queue runner and a separate spool, but Im thinking
+# there might be another way. seeing debug output would probably be
+# helpful.
+
 # background: I want to run exim in a network namespace so it can send
 # and receive through a vpn. This is needed so it can do ipv6, because
 # outside the namespace if we dont have ipv6, to send ipv6 through the
@@ -911,8 +918,8 @@ EOF
 
 # for debugging info, uncomment these.
 # logs go to syslog and to /var/log/mail.log
-auth_verbose=yes
-mail_debug=yes
+#auth_verbose=yes
+#mail_debug=yes
 
 
 protocol lmtp {
@@ -1642,7 +1649,7 @@ EOF
 # iank.bid is for testing
 # mail.iankelling.org is for machines i own
 # this is duplicated in a later router
-dc_other_hostnames='iankelling.org;zroe.org'
+dc_other_hostnames='iankelling.org;zroe.org;r2e.iankelling.org'
 EOF
 
 
@@ -1668,7 +1675,7 @@ EOF
 vpnmanual:
   debug_print = "R: dnslookup for $local_part@$domain"
   driver = manualroute
-  domains = iankelling.org:zroe.org
+  domains = iankelling.org:zroe.org:r2e.iankelling.org
   transport = remote_smtp
   same_domain_copy_routing = yes
   route_list = * 10.8.0.4

diff --git a/system-status b/system-status
index 3d5b40e8fd4f74232652ec558ea2a8ed1542f76c..fa9c7bc0ccfb3674ebdea037eca76fb47ae1c4b5 100644 (file)
--- a/system-status
+++ b/system-status
@@ -100,11 +100,11 @@ write-status() {
 
   # these conditions are so we dont have an overly verbose prompt
   if $begin && $end; then
-    chars+=("DISTRO!")
+    chars+=("D")
   elif $begin; then
-    chars+=("DISTRO-BEGIN!")
+    chars+=("DB")
   elif $end; then
-    chars+=("DISTRO-END!")
+    chars+=("DE")
   else
     f=~/.local/conflink
     # shellcheck disable=SC2043