fixes

[distro-setup] / conflink

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 #####