diff options
| author | Ryan Lahfa <masterancpp@gmail.com> | 2022-12-08 23:47:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-08 23:47:08 +0100 |
| commit | 022c7d777adf09ba2a6a9288d2b232e73b802ee8 (patch) | |
| tree | 2900bc830e5110fc58d5448f78f931833b6691f7 /nixos/tests | |
| parent | cf9ada01035a72ccbcc80a14d5e45777cf4559e2 (diff) | |
| parent | 2c0042956018b6b0dbe41195362afacf704b7214 (diff) | |
Merge pull request #196837 from KoviRobi/dnsmasq-attrsets-config
nixos/dnsmasq: Use attrs instead of plain text config
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/dnscrypt-proxy2.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/kubernetes/dns.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/schleuder.nix | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/nixos/tests/dnscrypt-proxy2.nix b/nixos/tests/dnscrypt-proxy2.nix index 4435d77bbf3b2..a75a745d3553c 100644 --- a/nixos/tests/dnscrypt-proxy2.nix +++ b/nixos/tests/dnscrypt-proxy2.nix @@ -26,7 +26,7 @@ in { }; services.dnsmasq.enable = true; - services.dnsmasq.servers = [ "127.0.0.1#${toString localProxyPort}" ]; + services.dnsmasq.settings.server = [ "127.0.0.1#${toString localProxyPort}" ]; }; }; diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix index 6299b7ff988af..1b7145eb5d5e3 100644 --- a/nixos/tests/kubernetes/dns.nix +++ b/nixos/tests/kubernetes/dns.nix @@ -69,7 +69,7 @@ let extraConfiguration = { config, pkgs, lib, ... }: { environment.systemPackages = [ pkgs.bind.host ]; services.dnsmasq.enable = true; - services.dnsmasq.servers = [ + services.dnsmasq.settings.server = [ "/cluster.local/${config.services.kubernetes.addons.dns.clusterIp}#53" ]; }; diff --git a/nixos/tests/schleuder.nix b/nixos/tests/schleuder.nix index a9e4cc325bc76..e57ef66bb8f9d 100644 --- a/nixos/tests/schleuder.nix +++ b/nixos/tests/schleuder.nix @@ -82,9 +82,7 @@ import ./make-test-python.nix { # Since we don't have internet here, use dnsmasq to provide MX records from /etc/hosts services.dnsmasq = { enable = true; - extraConfig = '' - selfmx - ''; + settings.selfmx = true; }; networking.extraHosts = '' |