From eb6ae208cbd86525d95090b107413a784fef41dc Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 15 May 2021 07:31:27 +0200 Subject: [PATCH] bundles/grafana: fix file system permissions --- bundles/grafana/items.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/bundles/grafana/items.py b/bundles/grafana/items.py index 06113e2..6857627 100644 --- a/bundles/grafana/items.py +++ b/bundles/grafana/items.py @@ -12,18 +12,28 @@ for row in Path(join(repo.path, 'bundles', 'grafana', 'dashboard-rows')).rglob(" directories = { '/etc/grafana/provisioning/dashboards': { + 'owner': 'grafana', + 'group': 'grafana', 'purge': True, }, '/etc/grafana/provisioning/datasources': { + 'owner': 'grafana', + 'group': 'grafana', 'purge': True, }, '/etc/grafana/provisioning/notifiers': { + 'owner': 'grafana', + 'group': 'grafana', 'purge': True, }, '/etc/grafana/provisioning/plugins': { + 'owner': 'grafana', + 'group': 'grafana', 'purge': True, }, '/var/lib/grafana/dashboards': { + 'owner': 'grafana', + 'group': 'grafana', 'purge': True, 'triggers': { 'svc_systemd:grafana-server:restart', @@ -36,6 +46,7 @@ files = { 'content_type': 'mako', 'context': node.metadata['grafana'], 'owner': 'grafana', + 'group': 'grafana', 'mode': '0640', 'triggers': { 'svc_systemd:grafana-server:restart', @@ -44,6 +55,7 @@ files = { '/etc/grafana/provisioning/dashboards/bundlewrap.yaml': { 'source': 'dashboards.yaml', 'owner': 'grafana', + 'group': 'grafana', 'mode': '0640', 'triggers': { 'svc_systemd:grafana-server:restart', @@ -123,6 +135,8 @@ if isdir(additional_path): continue files[f'/var/lib/grafana/dashboards/{file}'] = { + 'owner': 'grafana', + 'group': 'grafana', 'source': join(node.name, 'dashboards', file), 'triggers': { 'svc_systemd:grafana-server:restart',