lots of fixes, improvements, t12 stuff

[distro-setup] / conflink

diff --git a/conflink b/conflink
index da04cb9a93a55959b9dadd02febbfcbd1715f531..0ca21f0f4bdfef728f85fbaafb3b2eea1e5a792a 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -252,20 +252,24 @@ case $user in
     if [[ -e /var/lib/znc ]] && getent group znc; then
       s chown -R znc:znc /var/lib/znc
     fi
-    if [[ -e /p/c/user-specific ]]; then
+    if [[ -e /p/c/user-specific/prometheus ]]; 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
+    if [[ -e /p/c/user-specific/www-data ]]; then
       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
+    # disabled
+    # 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
+
     # this folder strangely requires ownership as icecast2
     if [[ -d /etc/icecast2 && -f /p/c/icecast.xml ]]; then
       m s rsync -rclgoDiSAX --chmod=0644 --chown=root:root /p/c/icecast.xml /etc/icecast2