X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=primary-setup;h=8683dcf433d0e4359c631487873051bd80ee65e0;hb=b87c76c4ad04f75a7dff371c65b5f065ba2839a4;hp=8ea0d06e4a80431288b4857dfe404028e2b51d07;hpb=01ccff895787ca94ad37d11cb93f0440a29edd7c;p=distro-setup

diff --git a/primary-setup b/primary-setup
index 8ea0d06..8683dcf 100755
--- a/primary-setup
+++ b/primary-setup
@@ -5,11 +5,20 @@
 
 source /usr/local/lib/err
 
-pre="${0##*/}:"
+script_name="${BASH_SOURCE[0]}"
+script_name="${script_name##*/}"
+pre="${SSH_CLIENT:+$HOSTNAME} $script_name:"
 m() { printf "$pre %s\n"  "$*"; "$@"; }
 e() { printf "$pre %s\n"  "$*"; }
 err() { echo "[$(date +'%Y-%m-%d %H:%M:%S%z')]: $0: $*" >&2; }
-
+# service maybe
+serm() {
+  local service=${@: -1}
+  if [[ ! -s /etc/systemd/system/$service ]]; then
+    return 0
+  fi
+  m "$@"
+}
 
 [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 
@@ -40,22 +49,26 @@ if [[ -e /dev/shm/iank-status ]]; then
 fi
 
 
+if [[ $HOSTNAME == "$MAIL_HOST" || $HOSTNAME == kd ]]; then
+  m systemctl --now enable btrbk.timer
+else
+  serm systemctl --now disable btrbk.timer
+fi
+
+
 if dpkg -s rss2email &>/dev/null; then
   if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
     # arbtt disabled for now
     #DISPLAY=:0 arbtt-capture --sample-rate=10 &
     m systemctl --now enable rss2email.timer
-    # off is in mail-setup. no reason for this to be in the rss2email block.
-    m systemctl --now enable btrbk.timer
   else
     files=(/sysd-mail-once/btrbk*)
     if (( ${#files[@]} )); then
       rm -f ${files[@]}
     fi
-    m systemctl --now disable btrbk.timer
 
-    m systemctl stop rss2email.service
-    m systemctl --now disable rss2email.timer
+    serm systemctl stop rss2email.service
+    serm systemctl --now disable rss2email.timer
     # arbtt disabled for now
     # for ((i=0; i<10; i++)); do
     #   killall arbtt-capture || break