From 5a0d733319a259b2ce833cc995cb75be426f8f8d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Fri, 25 Nov 2022 09:15:24 +0100
Subject: ...

---
 hosts/vidhar/network/default.nix    | 9 ++++++---
 hosts/vidhar/prometheus/default.nix | 7 +------
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'hosts/vidhar')

diff --git a/hosts/vidhar/network/default.nix b/hosts/vidhar/network/default.nix
index f19ea9cd..0cf17c0a 100644
--- a/hosts/vidhar/network/default.nix
+++ b/hosts/vidhar/network/default.nix
@@ -48,12 +48,15 @@
         enable = true;
         rulesetFile = ./ruleset.nft;
       };
-    };
 
-    services.resolved = {
-      llmnr = "false";
+      resolvconf = {
+        enable = true;
+        useLocalResolver = true;
+      };
     };
 
+    services.resolved.enable = false;
+
     systemd.services."systemd-networkd-wait-online".enable = false;
 
     environment.etc."dnssec-trust-anchors.d/root.positive".source = "${pkgs.dns-root-data}/root.ds";
diff --git a/hosts/vidhar/prometheus/default.nix b/hosts/vidhar/prometheus/default.nix
index e6de6806..14d6dabf 100644
--- a/hosts/vidhar/prometheus/default.nix
+++ b/hosts/vidhar/prometheus/default.nix
@@ -216,7 +216,7 @@ in {
           metrics_path = "/probe";
           params = { module = ["dns_soa"]; };
           static_configs = [
-            { targets = ["127.0.0.53:53" "127.0.0.1:53"]; }
+            { targets = ["127.0.0.1:53"]; }
           ];
           relabel_configs = [
             { source_labels = ["__address__"];
@@ -224,11 +224,6 @@ in {
             }
           ] ++ relabelHosts ++
           [ { source_labels = ["__param_target"];
-              target_label = "job";
-              regex = "127\.0\.0\.53:53";
-              replacement = "systemd-resolved.dns_soa";
-            }
-            { source_labels = ["__param_target"];
               target_label = "job";
               regex = "127\.0\.0\.1:53";
               replacement = "unbound.dns_soa";
-- 
cgit v1.2.3