various improvements

[distro-setup] / primary-setup

diff --git a/primary-setup b/primary-setup
index 26ce7447dc03652040e84801f45e3314d39b6c12..8ea0d06e4a80431288b4857dfe404028e2b51d07 100755 (executable)
--- a/primary-setup
+++ b/primary-setup
@@ -16,12 +16,29 @@ err() { echo "[$(date +'%Y-%m-%d %H:%M:%S%z')]: $0: $*" >&2; }
 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
 
+# fixing up a bad state that servers got in.
+if [[ -e /dev/shm/iank-status ]]; then
+  chown iank.iank /dev/shm/iank-status
+fi
+
 
 if dpkg -s rss2email &>/dev/null; then
   if [[ $HOSTNAME == "$MAIL_HOST" ]]; then
@@ -31,6 +48,10 @@ if dpkg -s rss2email &>/dev/null; then
     # 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