From: Ian Kelling <ian@iankelling.org>
Date: Thu, 11 May 2023 15:41:31 +0000 (-0400)
Subject: fix prometheus regression
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=5caf70ebd54aed4f4c661d519dc5cf8e757e2708;p=distro-setup

fix prometheus regression
---

diff --git a/conflink b/conflink
index 5c135c4..a49465d 100755
--- a/conflink
+++ b/conflink
@@ -237,7 +237,7 @@ case $user in
       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/prometheus-web/prometheus-htpasswd /etc
+      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