rename err to bash-bear

[distro-setup] / conflink

diff --git a/conflink b/conflink
index a49465d811e4d97e8fb6defbffb404d7dc204ed6..d661e172dfd5a5b1d2f5790236221dfc59f62232 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source /a/bin/errhandle/err
+source /a/bin/bash-bear-trap/bash-bear
 err-cleanup() {
   echo 1 >~/.local/conflink
 }
@@ -114,7 +114,8 @@ common-file-setup() {
       # we dont want t, instead c for checksum.
       # That way we dont set times on directories.
       # -a = -rlptgoD
-      cmd=( s rsync -rclpgoDiSAX --chmod=Dg-s --chown=root:root
+      # -A is acls, implies -p
+      cmd=( s rsync -rclgoDiSAX --chmod=Dg-s --chown=root:root
             --exclude=/etc/dovecot/users
             --exclude='/etc/exim4/passwd*'
             --exclude='/etc/exim4/*.pem'
@@ -216,10 +217,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,24 +230,20 @@ 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
-    fi
-    f=/etc/nagios4/htdigest.users
-    if [[ -e $f ]]; then
-      if getent passwd nagios &>/dev/null; then
-        s chown nagios:www-data $f
+    if [[ -e /p/c/user-specific ]]; then
+      if getent passwd prometheus &>/dev/null; then
+        v s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:prometheus /p/c/user-specific/prometheus/prometheus-pass /etc
+        v s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:prometheus /p/c/user-specific/prometheus/prometheus/ssl/* /etc/prometheus/ssl
       fi
-    fi
-    f=/var/lib/bitcoind/settings.json
-    if [[ -e $f ]]; then
-      if getent passwd bitcoin &>/dev/null; then
-        s chown bitcoin:bitcoin $f
+      if getent passwd www-data &>/dev/null; then
+        v s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:www-data /p/c/user-specific/www-data/* /etc
       fi
     fi
+
+    if [[ -d /var/lib/bitcoind && -d /p/c/user-specific/bitcoin ]]; 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 #####
 
     if ! $fast; then