prometheus related updates

[distro-setup] / conflink

diff --git a/conflink b/conflink
index 03c58408443153340df5557c75a221962c512975..e20da6e94f743b607aac6a17553591ca569e6f00 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -231,21 +231,18 @@ case $user in
     fi
     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
+        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
       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
-      if getent passwd nagios &>/dev/null; then
-        s chown nagios:www-data $f
+        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 ]]; then
+    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
+      # i'm not sure of the perfect permissions here, but
+      # 640 seems good.
       s rsync -rclpgoDiSAX --chmod=Dg-s --chown=root:bitcoin /p/c/user-specific/bitcoin/bitcoin /etc
     fi
     ##### end special extra stuff #####