mostly profanity and fixes

[distro-setup] / primary-setup

diff --git a/primary-setup b/primary-setup
index 8683dcf433d0e4359c631487873051bd80ee65e0..49961efed986a3fb6e704cf20de161603490d475 100755 (executable)
--- a/primary-setup
+++ b/primary-setup
@@ -7,13 +7,14 @@ source /usr/local/lib/err
 
 script_name="${BASH_SOURCE[0]}"
 script_name="${script_name##*/}"
-pre="${SSH_CLIENT:+$HOSTNAME} $script_name:"
+pre="$script_name:${0##*/}:${SSH_CLIENT:+ $HOSTNAME:}"
 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}
+  local service
+  service="${*: -1}"
   if [[ ! -s /etc/systemd/system/$service ]]; then
     return 0
   fi
@@ -25,20 +26,8 @@ serm() {
 if [[ $1 ]]; then
   new_host=$1
   if [[ $new_host == localhost ]]; then
-    mailhost_p=1
     new_host=$HOSTNAME
-  else
-    mailhost_p=0
   fi
-
-  # https://www.robustperception.io/how-to-have-labels-for-machine-roles
-  dir=/var/lib/prometheus/node-exporter
-  if [[ -e $dir  ]]; then
-    cat > $dir/mailhost.prom <<EOF
-host_role{role="mailhost"} $mailhost_p
-EOF
-  fi
-
   m sed -ri "s/MAIL_HOST=.*/MAIL_HOST=$new_host/" /a/bin/bash_unpublished/source-state
 fi
 source /a/bin/bash_unpublished/source-state
@@ -49,6 +38,21 @@ if [[ -e /dev/shm/iank-status ]]; then
 fi
 
 
+if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
+  mailhost_p=1
+else
+  mailhost_p=0
+fi
+# https://www.robustperception.io/how-to-have-labels-for-machine-roles
+dir=/var/lib/prometheus/node-exporter
+if [[ -e $dir  ]]; then
+  cat > $dir/mailhost.prom <<EOF
+host_role{role="mailhost"} $mailhost_p
+EOF
+fi
+
+
+
 if [[ $HOSTNAME == "$MAIL_HOST" || $HOSTNAME == kd ]]; then
   m systemctl --now enable btrbk.timer
 else