various fixes and improvements

[distro-setup] / mail-setup

diff --git a/mail-setup b/mail-setup
index fdb4c219d4eb2b9154c500c93fe6d751fe962113..b02da1ea52efaec1099e71c47d903269f47b815e 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -28,12 +28,14 @@ Setup exim4 / postfix / dovecot
 The minimal assumption we have is that /etc/mailpass exists
 
 
-I\'ve had problems with postfix on debian:
+I've had problems with postfix on debian:
 on stretch, a startup ordering issue caused all mail to fail.
 postfix changed defaults to only use ipv6 dns, causing all my mail to fail.
-I haven\'t gotten around to getting a non-debian exim
+I haven't gotten around to getting a non-debian exim
 setup.
 
+
+
 -h|--help  Print help and exit.
 EOF
     exit $1
@@ -289,8 +291,9 @@ else # begin exim. has debian specific stuff for now
 
     if [[ -e /p/c/filesystem ]]; then
         # to put the hostname in the known hosts
-        ssh -o StrictHostKeyChecking=no root@li.iankelling.org :
-        /a/exe/vpn-mk-client-cert -b mail -n mail li.iankelling.org
+        :
+        #ssh -o StrictHostKeyChecking=no root@li.iankelling.org :
+        #/a/exe/vpn-mk-client-cert -b mail -n mail li.iankelling.org
     fi
 
     cat >/etc/systemd/system/mailroute.service <<EOF
@@ -413,7 +416,7 @@ OnCalendar=daily
 WantedBy=timers.target
 EOF
     systemctl daemon-reload
-    systemctl start mailcert
+    #systemctl start mailcert
     systemctl restart mailcert.timer
     systemctl enable mailcert.timer
 
@@ -891,6 +894,9 @@ EOF
     done
     # end setup passwd.client
 
+    # by default, only 10 days of logs are kept. increase that.
+    sed -ri 's/^(\s*rotate\s).*/\11000/' /etc/logrotate.d/exim4-base
+
     systemctl restart exim4
 
 fi  #### end if exim4