fix for expired domain and non-mailhost exim

diff --git a/mail-setup b/mail-setup
index bf1a7ffcc3828ed3863961b8203c3d8e8b11aee4..7a60e895cf510a650e30a6f5d5c925e4aa4dba74 100755 (executable)
--- a/mail-setup
+++ b/mail-setup
@@ -1134,7 +1134,6 @@ clear_report_template
 report (_SCORE_ / _REQD_ requ) _TESTSSCORES(,)_ autolearn=_AUTOLEARN
 uridnsbl_skip_domain iankelling.org
 uridnsbl_skip_domain amnimal.ninja
-uridnsbl_skip_domain expertpathologyreview.com
 uridnsbl_skip_domain zroe.org
 EOF
 
@@ -1479,7 +1478,6 @@ cat >/etc/exim4/conf.d/retry/17_retry <<'EOF'
 # Retry fast for my own domains
 iankelling.org * F,1d,1m;F,14d,1h
 amnimal.ninja * F,1d,1m;F,14d,1h
-expertpathologyreview.com * F,1d,1m;F,14d,1h
 je.b8.nz * F,1d,1m;F,14d,1h
 zroe.org * F,1d,1m;F,14d,1h
 eximbackup.b8.nz * F,1d,1m;F,14d,1h
@@ -1496,7 +1494,6 @@ fencepost.gnu.org * F,1d,1m;F,14d,1h
 
 # afaik our retry doesnt need this, but just using everything
 mx.amnimal.ninja * F,1d,1m;F,14d,1h
-mx.expertpathologyreview.com * F,1d,1m;F,14d,1h
 
 
 mail.fsf.org * F,1d,15m;F,14d,1h
@@ -2691,7 +2688,7 @@ esac
 
 # * thunderbird autoconfig setup
 
-bkdomains=(expertpathologyreview.com amnimal.ninja)
+bkdomains=(amnimal.ninja)
 if [[ $HOSTNAME == bk ]]; then
   for domain in ${bkdomains[@]}; do
     m /a/exe/web-conf apache2 autoconfig.$domain
@@ -2755,7 +2752,7 @@ if [[ $HOSTNAME == bk ]]; then
   pi php-zip apache2 php-fpm
   phpver=$(dpkg-query -s php-fpm | sed -nr 's/^Depends:.* php([^ ]*)-fpm( .*|$)/\1/p')
   fpm=$(dpkg-query -s php-fpm | sed -nr 's/^Depends:.* (php[^ ]*-fpm)( .*|$)/\1/p') # eg: php7.4-fpm
-  ncdirs=(/var/www/ncexpertpath /var/www/ncninja)
+  ncdirs=(/var/www/ncninja)
 
   ### begin php setup for roundcube and nextcloud ###
   # Enable PHP modules.
@@ -2777,7 +2774,7 @@ apc.enable_cli = 1
 EOF
 
 
-  rcdirs=(/usr/local/lib/rcexpertpath /usr/local/lib/rcninja)
+  rcdirs=(/usr/local/lib/rcninja)
 
   for ((i=0; i < ${#bkdomains[@]}; i++)); do
     domain=${bkdomains[i]}
@@ -3960,14 +3957,19 @@ EOF
     m chmod 755 $f
 
     ;;
-  # ** bk
-  ## we use this host to monitor MAIL_HOST and host a mail server for someone
-  bk)
+  # ** ! MAILHOST
+  *)
+# note: this depends on the previous section having ;; vs ;;&
 
+    # this router is only hit by je and bk, but it is defined on all hosts for convenience.
     cat >>/etc/exim4/conf.d/router/900_exim4-config_local_user <<'EOF'
   route_list = * 127.0.0.1
 EOF
 
+    ;;&
+  # ** bk
+  ## we use this host to monitor MAIL_HOST and host a mail server for someone
+  bk)
 
     # No clamav on je, it has 1.5g memory and clamav uses most of it.
     #
@@ -4040,7 +4042,7 @@ EOF
     echo bk.b8.nz > /etc/mailname
     cat >>/etc/exim4/update-exim4.conf.conf <<EOF
 # man page: is used to build the local_domains list, together with "localhost"
-dc_other_hostnames='amnimal.ninja;expertpathologyreview.com;bk.b8.nz'
+dc_other_hostnames='amnimal.ninja;bk.b8.nz'
 EOF
 
     ;;
@@ -4387,7 +4389,7 @@ EOF
     ;;&
   $MAIL_HOST)
     test_froms=(ian@iankelling.org z@zroe.org iank@gnu.org)
-    test_tos=(testignore@expertpathologyreview.com testignore@je.b8.nz testignore@amnimal.ninja jtuttle@gnu.org)
+    test_tos=(testignore@je.b8.nz testignore@amnimal.ninja jtuttle@gnu.org)
 
     cat >>/etc/cron.d/mailtest <<EOF
 # 10 am friday
@@ -4396,11 +4398,11 @@ EOF
 EOF
     ;;&
   bk)
-    test_froms=(testignore@amnimal.ninja testignore@expertpathologyreview.com)
+    test_froms=(testignore@amnimal.ninja)
     test_tos=(testignore@iankelling.org testignore@je.b8.nz)
     # We dont need to send from different addresses to the same
     # address. this breaks down our nice elegant logic of building up
-    # froms and tos , so I just handle expertpath in a special case
+    # froms and tos , so I just handle amnimal.ninja in a special case
     # below and set the to: to be testignore@zroe.org.  If we did sent
     # that way, it would also mess up our mailtest-check logic that
     # finds which messages to check.
@@ -4409,7 +4411,7 @@ EOF
     ;;&
   je)
     test_froms=(testignore@je.b8.nz)
-    test_tos=(testignore@iankelling.org testignore@zroe.org testignore@expertpathologyreview.com testignore@amnimal.ninja)
+    test_tos=(testignore@iankelling.org testignore@zroe.org testignore@amnimal.ninja)
     ;;&
   $MAIL_HOST|bk|je)
 
@@ -4426,7 +4428,7 @@ EOF
 #!/bin/bash
 # we remove from the queue older than 4.3 minutes since we send every 5 minutes.
 olds=(
-$(/usr/sbin/exiqgrep -o 260 -i -r '^(testignore@(iankelling\.org|zroe\.org|expertpathologyreview\.com|amnimal\.ninja|je\.b8\.nz)|jtuttle@gnu\.org)$')
+$(/usr/sbin/exiqgrep -o 260 -i -r '^(testignore@(iankelling\.org|zroe\.org|amnimal\.ninja|je\.b8\.nz)|jtuttle@gnu\.org)$')
 )
 if (( ${#olds[@]} )); then
   /usr/sbin/exim -Mrm "${olds[@]}" >/dev/null
@@ -4441,7 +4443,7 @@ EOF
         fi
         test_to+=", $t"
       done
-      if [[ $test_from ==  testignore@expertpathologyreview.com ]]; then
+      if [[ $test_from ==  testignore@amnimal.ninja ]]; then
         test_to=testignore@zroe.org
       fi