From 8ccb1477db36e350b65523d7427ce22d316e8523 Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Sat, 17 Dec 2022 20:22:49 +0100
Subject: [PATCH] VEGAS/monitoring: extraOptions -> settings

---
 hosts/VEGAS/services/monitoring/default.nix | 25 +++++----------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/hosts/VEGAS/services/monitoring/default.nix b/hosts/VEGAS/services/monitoring/default.nix
index 4f7f5c1..2e30bf6 100644
--- a/hosts/VEGAS/services/monitoring/default.nix
+++ b/hosts/VEGAS/services/monitoring/default.nix
@@ -8,22 +8,7 @@ let
 
   cfg = { inherit (config.services) loki; };
 
-  toString' = v:
-    if v == true then "true" else
-    if v == false then "false" else
-    toString v;
-
-  mapPaths = lib.mapAttrsRecursive (
-    path: value: lib.nameValuePair
-      (lib.toUpper (lib.concatStringsSep "_" path))
-      (toString' value)
-  );
-
-  translateConfig = config: lib.listToAttrs (
-    lib.collect
-      (x: x ? name && x ? value)
-      (mapPaths config)
-  );
+  iniList = lib.concatStringsSep " ";
 
   login = x: "https://login.${domain}/auth/realms/master/protocol/openid-connect/${x}";
 in
@@ -49,15 +34,15 @@ in
     rootUrl = "https://monitoring.${domain}/";
     dataDir = "/srv/storage/private/grafana";
     analytics.reporting.enable = false;
-    extraOptions = translateConfig {
-      auth.generic_oauth = {
+    settings = {
+      "auth.generic_oauth" = {
         enabled = true;
         allow_sign_up = true;
         client_id = "net.privatevoid.monitoring1";
         auth_url = login "auth";
         token_url = login "token";
         api_url = login "userinfo";
-        scopes = [ "openid" "profile" "email" "roles" ];
+        scopes = iniList [ "openid" "profile" "email" "roles" ];
         role_attribute_strict = true;
         role_attribute_path = "resource_access.monitoring.roles[0]";
       };
@@ -65,7 +50,7 @@ in
         cookie_secure = true;
         disable_gravatar = true;
       };
-      feature_toggles.enable = [
+      feature_toggles.enable = iniList [
         "tempoSearch"
         "tempoBackendSearch"
         "tempoServiceGraph"