various fixes

[distro-setup] / conflink

diff --git a/conflink b/conflink
index bfd4e448814e38414c9f0ced5fdedcbfbf7256e4..d3a7b2a7663c09dbbf6cbee679a75790383c8dc6 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -90,6 +90,11 @@ common-file-setup() {
       while read -r line; do
         file="${line:12}"
         case $file in
+          etc/prometheus/rules/iank.yml)
+            case $HOSTNAME in
+              kd) m s systemctl reload prometheus ;;
+            esac
+            ;;
           etc/systemd/system/*)
             reload_systemd=true
             ;;
@@ -135,6 +140,17 @@ for x in /p/c/machine_specific/*.hosts /a/bin/ds/machine_specific/*.hosts; do
   if grep -qxF $HOSTNAME $x; then all_dirs+=( ${x%.hosts} ); fi
 done
 
+# old files 2022-03
+for t in systemstatus epanicclean btrfsmaintstop dynamicipupdate; do
+  f=/etc/systemd/system/$t.timer
+  if [[ -e $f ]]; then
+    s systemctl stop $t.timer
+    s systemctl disable $t.timer
+    s rm -fv $f
+    reload_systemd=true
+  fi
+done
+
 c_dirs=(/a/c{,/machine_specific/$HOSTNAME})
 case $user in
   iank)