iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prometheus related updates
[distro-setup]
/
conflink
diff --git
a/conflink
b/conflink
index efc7dd7ed7c56c8bb9b3cd13d601a85b947a7982..e20da6e94f743b607aac6a17553591ca569e6f00 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-231,10
+231,11
@@
case $user in
fi
if [[ -e /p/c/user-specific ]]; then
if getent passwd prometheus &>/dev/null; then
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
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
+
v
s rsync -clpgoDiSAX --chmod=Dg-s --chown=root:www-data /p/c/user-specific/www-data/* /etc
fi
fi
fi
fi