fixes

diff --git a/conflink b/conflink
index a49465d811e4d97e8fb6defbffb404d7dc204ed6..03c58408443153340df5557c75a221962c512975 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -216,10 +216,6 @@ case $user in
     #### begin special extra stuff ####
     install -d -m700 ~/gpg-agent-socket
 
-    if [[ -e /etc/bitcoin ]] && getent group bitcoin &>/dev/null; then
-      s chown bitcoin:bitcoin /etc/bitcoin
-    fi
-
     f=/var/lib/bind
     if [[ -e $f ]]; then
       # reset to the original permissions.
@@ -233,11 +229,13 @@ case $user in
     if [[ -e /var/lib/znc ]] && getent group znc; then
       s chown -R znc:znc /var/lib/znc
     fi
-    if getent passwd prometheus &>/dev/null; then
-      s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:prometheus /p/c/user-specific/prometheus/prometheus-pass /etc
-    fi
-    if getent passwd www-data &>/dev/null; then
-      s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:www-data /p/c/user-specific/www-data/* /etc
+    if [[ -e /p/c/user-specific ]]; then
+      if getent passwd prometheus &>/dev/null; then
+        s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:prometheus /p/c/user-specific/prometheus/prometheus-pass /etc
+      fi
+      if getent passwd www-data &>/dev/null; then
+        s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:www-data /p/c/user-specific/www-data/* /etc
+      fi
     fi
     f=/etc/nagios4/htdigest.users
     if [[ -e $f ]]; then
@@ -245,11 +243,10 @@ case $user in
         s chown nagios:www-data $f
       fi
     fi
-    f=/var/lib/bitcoind/settings.json
-    if [[ -e $f ]]; then
-      if getent passwd bitcoin &>/dev/null; then
-        s chown bitcoin:bitcoin $f
-      fi
+
+    if [[ -d /var/lib/bitcoind ]]; then
+      s rsync -clpgoDiSAX --chmod=Dg-s --chown=bitcoin:bitcoin /p/c/user-specific/bitcoin/settings.json /var/lib/bitcoind
+      s rsync -rclpgoDiSAX --chmod=Dg-s --chown=root:bitcoin /p/c/user-specific/bitcoin/bitcoin /etc
     fi
     ##### end special extra stuff #####
 

diff --git a/distro-end b/distro-end
index c2aeec3ac4e67c772eb8b41f70c4c46e5105ba9f..3d3a9e18e77bb71962ab31c1fe6c5fe29e41b242 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -2175,10 +2175,10 @@ esac
 ### begin bitcoin ###
 
 case $HOSTNAME in
-  sy)
-    f=$dir/bitcoin.conf
-    sudo install -m 0755 -o root -g root -t /usr/bin /a/opt/bitcoin-23.0/bin/*
+  sy|kd)
+    sudo install -m 0755 -o root -g root -t /usr/bin /a/opt/bitcoin-24.1/bin/*
     sgo bitcoind
+    # note: the bitcoin user & group are setup in fai
     sudo usermod -a -G bitcoin iank
     if [[ ! $(readlink -f /var/lib/bitcoind/wallets) == /q/wallets ]]; then
       sudo lnf /q/wallets /var/lib/bitcoind

diff --git a/primary-setup b/primary-setup
index b8e594cbd93218e522253dbcbef5c8360d2f663f..8683dcf433d0e4359c631487873051bd80ee65e0 100755 (executable)
--- a/primary-setup
+++ b/primary-setup
@@ -11,7 +11,14 @@ 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]}" "$@"
 
@@ -45,7 +52,7 @@ fi
 if [[ $HOSTNAME == "$MAIL_HOST" || $HOSTNAME == kd ]]; then
   m systemctl --now enable btrbk.timer
 else
-  m systemctl --now disable btrbk.timer
+  serm systemctl --now disable btrbk.timer
 fi
 
 
@@ -60,8 +67,8 @@ if dpkg -s rss2email &>/dev/null; then
       rm -f ${files[@]}
     fi
 
-    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