about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--modules/services/monitoring/grafana.nix2
-rw-r--r--profiles/monitoring/loki.nix7
-rw-r--r--profiles/router.nix2
3 files changed, 5 insertions, 6 deletions
diff --git a/modules/services/monitoring/grafana.nix b/modules/services/monitoring/grafana.nix
index 28e86f6..c24506f 100644
--- a/modules/services/monitoring/grafana.nix
+++ b/modules/services/monitoring/grafana.nix
@@ -33,7 +33,7 @@ in
           }
           {
             name = "loki";
-            url = "http://${config.my.services.monitoring.loki.listenAddress}:${toString config.my.services.monitoring.loki.listenPort}";
+            url = "http://loki.${config.homelab.domain}";
             type = "loki";
           }
         ];
diff --git a/profiles/monitoring/loki.nix b/profiles/monitoring/loki.nix
index 1200846..012b986 100644
--- a/profiles/monitoring/loki.nix
+++ b/profiles/monitoring/loki.nix
@@ -13,7 +13,7 @@
 
     ingester = {
       lifecycler = {
-        address = cfg.listenAddress;
+        address = "127.0.0.1";
         ring = {
           kvstore = { store = "inmemory"; };
           replication_factor = 1;
@@ -86,9 +86,8 @@
   };
 
   services.nginx.virtualHosts."loki.${config.homelab.domain}" = {
-    default = true;
     forceSSL = true;
-    enableACME = true;
+    useACMEHost = config.homelab.domain;
     listen = [
       {
         addr = "192.168.6.40";
@@ -97,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 services.loki.configuration.server.http_listen_port}";
     };
   };
 }
diff --git a/profiles/router.nix b/profiles/router.nix
index 2ed88bb..1f33bca 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,tahoe.home
+      cname=loki.fcuny.xyz,192.168.6.40
     '';
   };