diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2022-11-25 09:15:24 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2022-11-25 09:15:24 +0100 |
commit | 5a0d733319a259b2ce833cc995cb75be426f8f8d (patch) | |
tree | 8e1d1b934d8df59d18eb7e8b7c56a4d27d479e20 | |
parent | 3032fc55abfc631c2fea559948dfaaeb799284d0 (diff) | |
download | nixos-5a0d733319a259b2ce833cc995cb75be426f8f8d.tar nixos-5a0d733319a259b2ce833cc995cb75be426f8f8d.tar.gz nixos-5a0d733319a259b2ce833cc995cb75be426f8f8d.tar.bz2 nixos-5a0d733319a259b2ce833cc995cb75be426f8f8d.tar.xz nixos-5a0d733319a259b2ce833cc995cb75be426f8f8d.zip |
...
-rw-r--r-- | hosts/vidhar/network/default.nix | 9 | ||||
-rw-r--r-- | hosts/vidhar/prometheus/default.nix | 7 |
2 files changed, 7 insertions, 9 deletions
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 @@ | |||
48 | enable = true; | 48 | enable = true; |
49 | rulesetFile = ./ruleset.nft; | 49 | rulesetFile = ./ruleset.nft; |
50 | }; | 50 | }; |
51 | }; | ||
52 | 51 | ||
53 | services.resolved = { | 52 | resolvconf = { |
54 | llmnr = "false"; | 53 | enable = true; |
54 | useLocalResolver = true; | ||
55 | }; | ||
55 | }; | 56 | }; |
56 | 57 | ||
58 | services.resolved.enable = false; | ||
59 | |||
57 | systemd.services."systemd-networkd-wait-online".enable = false; | 60 | systemd.services."systemd-networkd-wait-online".enable = false; |
58 | 61 | ||
59 | environment.etc."dnssec-trust-anchors.d/root.positive".source = "${pkgs.dns-root-data}/root.ds"; | 62 | 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 { | |||
216 | metrics_path = "/probe"; | 216 | metrics_path = "/probe"; |
217 | params = { module = ["dns_soa"]; }; | 217 | params = { module = ["dns_soa"]; }; |
218 | static_configs = [ | 218 | static_configs = [ |
219 | { targets = ["127.0.0.53:53" "127.0.0.1:53"]; } | 219 | { targets = ["127.0.0.1:53"]; } |
220 | ]; | 220 | ]; |
221 | relabel_configs = [ | 221 | relabel_configs = [ |
222 | { source_labels = ["__address__"]; | 222 | { source_labels = ["__address__"]; |
@@ -225,11 +225,6 @@ in { | |||
225 | ] ++ relabelHosts ++ | 225 | ] ++ relabelHosts ++ |
226 | [ { source_labels = ["__param_target"]; | 226 | [ { source_labels = ["__param_target"]; |
227 | target_label = "job"; | 227 | target_label = "job"; |
228 | regex = "127\.0\.0\.53:53"; | ||
229 | replacement = "systemd-resolved.dns_soa"; | ||
230 | } | ||
231 | { source_labels = ["__param_target"]; | ||
232 | target_label = "job"; | ||
233 | regex = "127\.0\.0\.1:53"; | 228 | regex = "127\.0\.0\.1:53"; |
234 | replacement = "unbound.dns_soa"; | 229 | replacement = "unbound.dns_soa"; |
235 | } | 230 | } |