From a9bb14c7281c90dd8cddebcc656861c6f61d8837 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Fri, 12 May 2023 15:37:33 -0700
Subject: profiles/monitoring: a bunch of fixes

---
 modules/services/monitoring/grafana.nix | 2 +-
 profiles/monitoring/loki.nix            | 2 +-
 profiles/nginx.nix                      | 2 +-
 profiles/router.nix                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/services/monitoring/grafana.nix b/modules/services/monitoring/grafana.nix
index c24506f..4407354 100644
--- a/modules/services/monitoring/grafana.nix
+++ b/modules/services/monitoring/grafana.nix
@@ -33,7 +33,7 @@ in
           }
           {
             name = "loki";
-            url = "http://loki.${config.homelab.domain}";
+            url = "https://loki.${config.homelab.domain}";
             type = "loki";
           }
         ];
diff --git a/profiles/monitoring/loki.nix b/profiles/monitoring/loki.nix
index 012b986..4b31bb4 100644
--- a/profiles/monitoring/loki.nix
+++ b/profiles/monitoring/loki.nix
@@ -96,7 +96,7 @@
       }
     ];
     locations."/" = {
-      proxyPass = "http://127.0.0.1:${toString services.loki.configuration.server.http_listen_port}";
+      proxyPass = "http://127.0.0.1:${toString config.services.loki.configuration.server.http_listen_port}";
     };
   };
 }
diff --git a/profiles/nginx.nix b/profiles/nginx.nix
index 7446cbc..e32106f 100644
--- a/profiles/nginx.nix
+++ b/profiles/nginx.nix
@@ -8,7 +8,7 @@
     # configuration of the router, since we need to listen on port 80
     # too for streaming.
     statusPage = true;
-    defaultHTTPListenPort = 8080;
+    defaultHTTPListenPort = 8008;
 
     recommendedGzipSettings = true;
     recommendedOptimisation = true;
diff --git a/profiles/router.nix b/profiles/router.nix
index 1f33bca..d259d6a 100644
--- a/profiles/router.nix
+++ b/profiles/router.nix
@@ -52,7 +52,7 @@
       dhcp-host=d8:bb:c1:44:1c:d3,tahoe,192.168.0.40,infinite
 
       # hosted names
-      cname=loki.fcuny.xyz,192.168.6.40
+      host-record=loki,loki.${config.homelab.domain},192.168.6.40
     '';
   };
 
-- 
cgit 1.4.1