summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 18add5c)
raw | patch | inline | side by side (parent: 18add5c)
author | Ian Kelling <ian@iankelling.org> | |
Thu, 11 May 2023 15:41:31 +0000 (11:41 -0400) | ||
committer | Ian Kelling <ian@iankelling.org> | |
Thu, 11 May 2023 15:41:31 +0000 (11:41 -0400) |
conflink | patch | blob | history |
diff --git a/conflink b/conflink
index 5c135c437f43443a5dc59297296128fb24617fbc..a49465d811e4d97e8fb6defbffb404d7dc204ed6 100755 (executable)
--- a/conflink
+++ b/conflink
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