From 8a10ea437cf74619865e0966f8be8f16e6cba938 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Mon, 5 Dec 2022 16:37:27 +0100
Subject: update to nixos22.11

---
 chaski/services/tracktrain.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'chaski/services/tracktrain.nix')

diff --git a/chaski/services/tracktrain.nix b/chaski/services/tracktrain.nix
index 5887f73..34391b0 100644
--- a/chaski/services/tracktrain.nix
+++ b/chaski/services/tracktrain.nix
@@ -60,15 +60,17 @@ in
 
   services.grafana = {
     enable = true;
-    domain = "tracktrain.ilztalbahn.eu";
-    rootUrl = "%(protocol)s://%(domain)s:/metrics/";
-    port = 2342;
-    addr = "0.0.0.0";
-    extraOptions.serve_from_sub_path = "true";
+    settings.server = {
+      serve_from_sub_path = true;
+      domain = "tracktrain.ilztalbahn.eu";
+      root_url = "%(protocol)s://%(domain)s:/metrics/";
+      http_port = 2342;
+      http_addr = "0.0.0.0";
+    };
 
     provision = {
       enable = true;
-      datasources = [ {
+      datasources.settings.datasources = [ {
         url = "http://localhost:9001";
         type = "prometheus";
         name = "prometheus";
@@ -98,7 +100,7 @@ in
         path = [ pkgs.wget ];
         script = ''
           cd /tmp
-          wget "https://ilztalbahn.eu/wp-content/uploads/2020/07/gtfs.zip"
+          # wget "https://ilztalbahn.eu/wp-content/uploads/2020/07/gtfs.zip"
           ${stripLib (((import inputs.tracktrain {nixpkgs = pkgs;}))
             # have to remove version constraints because some aren't in 22.05
             .overrideAttrs (old: { patchPhase = ''
-- 
cgit v1.2.3