fix: base.conf ebenfalls rendern (NODE_NAME/URLs/Token blieben als Platzhalter); Warnung bei unaufgeloesten Platzhaltern

This commit is contained in:
mm committed 2026-09-13 20:52:16 +02:00
1 parent 090984e7f9
commit 0dbfc12b9b
1 file changed
+6 -2
+6 -2
View File
@@ -239,10 +239,14 @@ fetch() { curl -fsSL "$REPO_RAW/$1" -o "$2" || die "Download $1 fehlgeschlagen."
fetch_conf() { fetch_conf() {
fetch "$1" "$2.tmp" fetch "$1" "$2.tmp"
set -a; [ -r /etc/default/telegraf ] && . /etc/default/telegraf; set +a set -a; [ -r /etc/default/telegraf ] && . /etc/default/telegraf; set +a
envsubst '${NODE_NAME} ${PVE_TOKEN} ${PVE_NODE} ${PVE_URL} ${APACHE_LOG}' < "$2.tmp" > "$2" envsubst '${NODE_NAME} ${PROM_URL} ${LOKI_URL} ${TELEGRAF_TOKEN} ${PVE_TOKEN} ${PVE_NODE} ${PVE_URL} ${APACHE_LOG}' < "$2.tmp" > "$2"
if grep -q '\${' "$2"; then
log "WARNUNG: $2 enthaelt noch unaufgeloeste Platzhalter:"
grep -o '\${[A-Z_]*}' "$2" | sort -u >&2
fi
rm -f "$2.tmp" rm -f "$2.tmp"
} }
fetch telegraf/base.conf /etc/telegraf/telegraf.conf fetch_conf telegraf/base.conf /etc/telegraf/telegraf.conf
rm -f /etc/telegraf/telegraf.d/*.conf rm -f /etc/telegraf/telegraf.d/*.conf
[ "$HAS_DOCKER" -eq 1 ] && { fetch telegraf/docker.conf /etc/telegraf/telegraf.d/docker.conf; usermod -aG docker telegraf 2>/dev/null || true; } [ "$HAS_DOCKER" -eq 1 ] && { fetch telegraf/docker.conf /etc/telegraf/telegraf.d/docker.conf; usermod -aG docker telegraf 2>/dev/null || true; }
case "$ROLE" in case "$ROLE" in