minor fixes and improvements

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index 626eb48b5c8600df2ba50b899ca49db0ae00a5a0..a36266f6365d2a43a0b97bd8c520d02ded65acde 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -715,7 +715,7 @@ EOF
 
 
     # needed for li's local mail delivery.
-    tu /etc/hosts <<<"10.8.0.4 mail.iankelling.org"
+    tu /etc/hosts <<<"10.8.0.4 mx.iankelling.org"
 
     # wgmail handles this.
     #sgo vpn-mail-forward.service
@@ -725,6 +725,13 @@ EOF
 
     # setup let's encrypt cert
     m web-conf apache2 mail.iankelling.org
+    # TODO, i expanded the above cert manually to mx.iankelling.org, this should be captured
+    # in the automation here. We use mail.iankelling.org as our ehlo name when sending mail
+    # but our mx record is mx.iankelling.org. Initially I was just using mail.iankelling.org,
+    # but the problem is I want multiple ips to be able to identify as mail.iankelling.org,
+    # but a subset to be mx.iankelling.org. Afaik, there is no problem with having
+    # our mail cert be for mail.iankelling.org, and have people connect to mx.ian...,
+    # but it doesn't make logical sense to do this.
     sudo rm -fv /etc/apache2/sites-enabled/mail.iankelling.org{,-redir}.conf
     ser reload apache2
 
@@ -1771,7 +1778,6 @@ m /a/bin/distro-setup/mymimes
 
 
 sgo dynamicipupdate.timer
-sgo epanicclean.timer
 
 
 # stop autopoping windows when i plug in an android phone.