From 1a1909f474c480484ac75308db646b8b4c003a29 Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Thu, 10 Dec 2020 22:17:14 -0500
Subject: [PATCH] various fixes

---
 brc2             | 4 ++--
 distro-end       | 6 ++++--
 mail-setup       | 6 +++---
 switch-mail-host | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/brc2 b/brc2
index e392c49..83b4828 100644
--- a/brc2
+++ b/brc2
@@ -274,7 +274,7 @@ jrun() { # journal run. run args, log to journal, tail and grep the journal.
   # Note, an alternative without systemd would be something like ts.
   # Note, I tried using systemd-cat, but this seems obviously better,
   # and that seemed to have a problem exiting during a systemctl daemon-reload
-  local cmd_name ret jr_pid
+  local cmd_name ret jr_pid s
   ret=0
   cmd_name=${1##*/}
   cmd=$1
@@ -289,7 +289,7 @@ jrun() { # journal run. run args, log to journal, tail and grep the journal.
   # systemd-cat. i dont know any way to trap ctrl-c and still run the
   # normal action for it. There might be a way, unsure.
   jr_pid=$!
-  systemd-run --unit "$cmd_name" --wait --collect "$cmd" "${@:2}" || ret=$
+  s systemd-run --unit "$cmd_name" --wait --collect "$cmd" "${@:2}" || ret=$?
   # This justs lets the journal output its last line
   # before the prompt comes up.
   sleep .5
diff --git a/distro-end b/distro-end
index 0635b17..dc3ccf3 100755
--- a/distro-end
+++ b/distro-end
@@ -349,8 +349,6 @@ Package: profile-sync-daemon
 Pin: release n=focal,o=Ubuntu
 Pin-Priority: 500
 EOF
-    seru enable psd
-    seru sart psd
 
     f=/etc/apt/sources.list.d/focal.list
     t=$(mktemp)
@@ -703,6 +701,10 @@ sudo update-alternatives --set x-www-browser /usr/bin/abrowser
 pi ${pall[@]} $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}') $($src/distro-pkgs)
 
 
+seru enable psd
+seru start psd
+
+
 # website is dead june 14 2019. back in october, but meh
 sudo rm -fv /etc/apt/sources.list.d/iridium-browser.list
 # case $distro in
diff --git a/mail-setup b/mail-setup
index 93bd990..ffb604b 100755
--- a/mail-setup
+++ b/mail-setup
@@ -1868,8 +1868,6 @@ EOF
     cat >>/etc/exim4/conf.d/main/000_local <<EOF
 # recommended if dns is expected to work
 CHECK_RCPT_VERIFY_SENDER = true
-# These seem like a good idea and have stoped spammers on my server
-CHECK_DATA_VERIFY_HEADER_SENDER = true
 # default config comment says: If you enable this, you might reject legitimate mail,
 # but eggs has had this a long time, so that seems unlikely.
 CHECK_DATA_VERIFY_HEADER_SYNTAX = true
@@ -2286,6 +2284,8 @@ esac
 case $HOSTNAME in
   $MAIL_HOST|bk|je)
     # note: cronjob "ian" also does some important monitoring
+    # todo: this will sometimes cause an alert because mailtest-check will run
+    # before we have setup network namespace and spamassassin
     cat >/etc/cron.d/mailtest <<EOF
 SHELL=/bin/bash
 PATH=/usr/bin:/bin:/usr/local/bin
@@ -2375,7 +2375,7 @@ done
 # Root and postmaster mail recipient:
 
 
-exit 0
+m exit 0
 :
 
 # Local Variables:
diff --git a/switch-mail-host b/switch-mail-host
index cdbeddc..c7cf265 100644
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -179,4 +179,4 @@ fi
 
 m $new_shell /a/exe/primary-setup localhost
 
-exit 0
+m exit 0
-- 
2.30.2