From 4da4d114a11d614c0fc9b8044dc9c12ff6d3adf5 Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Tue, 8 Mar 2022 16:15:28 -0500 Subject: [PATCH] fix permissions for WAL data directory Fixes #1471 --- CHANGELOG.md | 3 +++ packaging/deb/control/postinst | 6 ++++++ packaging/rpm/control/postinst | 7 ++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8d2669f2b8c..37347f7ffbe1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,9 @@ - [BUGFIX] Fix issue with windows_exporter mssql collector crashing the agent. (@mattdurham) +- [BUGFIX] The deb and rpm files will now ensure the /var/lib/grafana-agent + data directory is created with permissions set to 0770. (@rfratto) + # v0.22.0 (2022-01-13) This release has deprecations. Please read [DEPRECATION] entries and consult diff --git a/packaging/deb/control/postinst b/packaging/deb/control/postinst index dea54daa22a7..84190a3cd306 100644 --- a/packaging/deb/control/postinst +++ b/packaging/deb/control/postinst @@ -26,6 +26,12 @@ case "$1" in usermod -a -G systemd-journal "$GRAFANA_AGENT_USER" fi + if [ ! -d /var/lib/grafana-agent ]; then + mkdir -p /var/lib/grafana-agent + chown $GRAFANA_AGENT_USER:$GRAFANA_AGENT_GROUP /var/lib/grafana-agent + chmod 770 /var/lib/grafana-agent + fi + chmod 640 /etc/grafana-agent.yaml chown root:$GRAFANA_AGENT_GROUP /etc/grafana-agent.yaml diff --git a/packaging/rpm/control/postinst b/packaging/rpm/control/postinst index 431ea7a81f7d..6481aca512dc 100644 --- a/packaging/rpm/control/postinst +++ b/packaging/rpm/control/postinst @@ -29,7 +29,12 @@ if [ "$1" -eq 1 ] ; then add_to_logging_groups - chown $AGENT_USER:$AGENT_GROUP /var/lib/grafana-agent + if [ ! -d /var/lib/grafana-agent ]; then + mkdir -p /var/lib/grafana-agent + chown $AGENT_USER:$AGENT_GROUP /var/lib/grafana-agent + chmod 770 /var/lib/grafana-agent + fi + chmod 640 /etc/grafana-agent.yaml chown root:$AGENT_GROUP /etc/grafana-agent.yaml