From 8dbb3544d4a1f9426b6b3782530b4efc975517b3 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Sat, 17 Jul 2021 03:37:51 +0000
Subject: [PATCH] grafana.nix: Formatting/white space/putting things in their
 right name space

This commit does not change the semantics, only the looks.
---
 nixos/modules/monitoring/server/grafana.nix | 50 ++++++++++-----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/nixos/modules/monitoring/server/grafana.nix b/nixos/modules/monitoring/server/grafana.nix
index d320907e..eed9a1a6 100644
--- a/nixos/modules/monitoring/server/grafana.nix
+++ b/nixos/modules/monitoring/server/grafana.nix
@@ -81,33 +81,33 @@ in {
         # Defend against DNS rebinding attacks.
         SERVER_ENFORCE_DOMAIN = "true";
       };
-    };
 
-    services.grafana.auth = {
-      anonymous.org_role = "Admin";
-      anonymous.org_name = "Main Org.";
-    } // grafanaAuth;
+      auth = {
+        anonymous.org_role = "Admin";
+        anonymous.org_name = "Main Org.";
+      } // grafanaAuth;
 
-    services.grafana.provision = {
-      enable = true;
-      # See https://grafana.com/docs/grafana/latest/administration/provisioning/#datasources
-      datasources = [{
-        name = "Prometheus";
-        type = "prometheus";
-        access = "proxy";
-        url = cfg.prometheusUrl;
-        isDefault = true;
-      } {
-        name = "Loki";
-        type = "loki";
-        access = "proxy";
-        url = cfg.lokiUrl;
-      }];
-      # See https://grafana.com/docs/grafana/latest/administration/provisioning/#dashboards
-      dashboards = [{
-        name = "provisioned";
-        options.path = ./grafana-config;
-      }];
+      provision = {
+        enable = true;
+        # See https://grafana.com/docs/grafana/latest/administration/provisioning/#datasources
+        datasources = [{
+          name = "Prometheus";
+          type = "prometheus";
+          access = "proxy";
+          url = cfg.prometheusUrl;
+          isDefault = true;
+        } {
+          name = "Loki";
+          type = "loki";
+          access = "proxy";
+          url = cfg.lokiUrl;
+        }];
+        # See https://grafana.com/docs/grafana/latest/administration/provisioning/#dashboards
+        dashboards = [{
+          name = "provisioned";
+          options.path = ./grafana-config;
+        }];
+      };
     };
 
     # nginx reverse proxy
-- 
GitLab