X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=e20da6e94f743b607aac6a17553591ca569e6f00;hb=46bcc5c1876aed04c2a4111a6ddd887951238ed6;hp=afbb9562ba8b577fc18eebd766b85dd0fb59f3b6;hpb=b87c76c4ad04f75a7dff371c65b5f065ba2839a4;p=distro-setup

diff --git a/conflink b/conflink
index afbb956..e20da6e 100755
--- a/conflink
+++ b/conflink
@@ -231,16 +231,11 @@ 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