iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor improvements
[distro-setup]
/
conflink
diff --git
a/conflink
b/conflink
index b24427fe40737ef5cafff1f96895cc94e191873e..e26be58e0693af8d3ce3ddb9e84bdba8a8e1f636 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-98,7
+98,9
@@
case $USER in
if [[ -e $f ]]; then
s chmod 640 $f /etc/prometheus-pass
s chown root:www-data $f
if [[ -e $f ]]; then
s chmod 640 $f /etc/prometheus-pass
s chown root:www-data $f
- s chown root:prometheus /etc/prometheus-pass
+ if getent passwd prometheus; then
+ s chown root:prometheus /etc/prometheus-pass
+ fi
fi
##### end special extra stuff #####
fi
##### end special extra stuff #####