From 529ffd694f4295f5205ef1236da15498c4418b02 Mon Sep 17 00:00:00 2001
From: niten <niten@sea.fudo.org>
Date: Thu, 8 Dec 2022 16:39:55 -0800
Subject: [PATCH] Grafana will read from files now

---
 lib/fudo/grafana.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/fudo/grafana.nix b/lib/fudo/grafana.nix
index 840b9f5..d80b152 100644
--- a/lib/fudo/grafana.nix
+++ b/lib/fudo/grafana.nix
@@ -205,19 +205,19 @@ in {
         in "${scheme}://${cfg.hostname}/";
         dataDir = cfg.state-directory;
 
-        security = {
-          adminPasswordFile = cfg.admin-password-file;
-          secretKeyFile = cfg.secret-key-file;
-        };
-
         settings = {
           smtp = {
             enable = true;
             # TODO: create system user as necessary
-            fromAddress = "${cfg.smtp.username}@${cfg.smtp.domain}";
+            from_address = "${cfg.smtp.username}@${cfg.smtp.domain}";
             host = "${cfg.smtp.hostname}:25";
             user = cfg.smtp.username;
-            passwordFile = cfg.smtp.password-file;
+            password = "$__${cfg.smtp.password-file}}";
+          };
+
+          security = {
+            admin_password = "$__{${cfg.admin-password-file}}";
+            secret_key = "$__file{${cfg.secret-key-file}}";
           };
 
           ldap.auth = mkIf (cfg.ldap != null) (let