iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
mostly fixes
[distro-setup]
/
conflink
diff --git
a/conflink
b/conflink
index e53605e2ae884abf341b7e7edd73ac579ba7d585..0f2e64c88450dcb2432bdb96a0024f85846fba4f 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-93,7
+93,7
@@
common-file-setup() {
while read -r line; do
file="${line:12}"
case $file in
- etc/prometheus/rules/iank.yml)
+ etc/prometheus/rules/iank.yml
|etc/prometheus/prometheus.yml
)
case $HOSTNAME in
kd)
if systemctl is-active prometheus &>/dev/null; then