summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshish SHUKLA <ashish.is@lostca.se>2023-11-13 08:34:41 +0000
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2024-02-14 16:41:40 +0000
commit59fe37e50607e86bef1fa0b2e08e8c4ebb4bde3c (patch)
tree40ec6909c2807f57b3a8d78b65653a31c680f1b3
parentunbound: 1.18.0 -> 1.19.0 (diff)
downloadnixpkgs-59fe37e50607e86bef1fa0b2e08e8c4ebb4bde3c.tar.gz
nixos/unbound: Fix deprecation warnings
(cherry picked from commit 61f957f87617d6a7c14a815346fc2a91b4ed0ce6)
-rw-r--r--nixos/tests/unbound.nix16
1 files changed, 8 insertions, 8 deletions
diff --git a/nixos/tests/unbound.nix b/nixos/tests/unbound.nix
index f6732390b434..39a01259edeb 100644
--- a/nixos/tests/unbound.nix
+++ b/nixos/tests/unbound.nix
@@ -106,8 +106,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
{
name = ".";
forward-addr = [
- (lib.head nodes.authoritative.config.networking.interfaces.eth1.ipv6.addresses).address
- (lib.head nodes.authoritative.config.networking.interfaces.eth1.ipv4.addresses).address
+ (lib.head nodes.authoritative.networking.interfaces.eth1.ipv6.addresses).address
+ (lib.head nodes.authoritative.networking.interfaces.eth1.ipv4.addresses).address
];
}
];
@@ -168,8 +168,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
"unbound-extra1.conf".text = ''
forward-zone:
name: "example.local."
- forward-addr: ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address}
- forward-addr: ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address}
+ forward-addr: ${(lib.head nodes.resolver.networking.interfaces.eth1.ipv6.addresses).address}
+ forward-addr: ${(lib.head nodes.resolver.networking.interfaces.eth1.ipv4.addresses).address}
'';
"unbound-extra2.conf".text = ''
auth-zone:
@@ -187,8 +187,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
client = { lib, nodes, ... }: {
imports = [ common ];
networking.nameservers = [
- (lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address
- (lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address
+ (lib.head nodes.resolver.networking.interfaces.eth1.ipv6.addresses).address
+ (lib.head nodes.resolver.networking.interfaces.eth1.ipv4.addresses).address
];
networking.interfaces.eth1.ipv4.addresses = [
{ address = "192.168.0.10"; prefixLength = 24; }
@@ -276,7 +276,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
resolver.wait_for_unit("multi-user.target")
with subtest("client should be able to query the resolver"):
- test(client, ["${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address}", "${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address}"], doh=True)
+ test(client, ["${(lib.head nodes.resolver.networking.interfaces.eth1.ipv6.addresses).address}", "${(lib.head nodes.resolver.networking.interfaces.eth1.ipv4.addresses).address}"], doh=True)
# discard the client we do not need anymore
client.shutdown()
@@ -298,7 +298,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
).strip()
# Thank you black! Can't really break this line into a readable version.
- expected = "example.local. IN forward ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address} ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address}"
+ expected = "example.local. IN forward ${(lib.head nodes.resolver.networking.interfaces.eth1.ipv6.addresses).address} ${(lib.head nodes.resolver.networking.interfaces.eth1.ipv4.addresses).address}"
assert out == expected, f"Expected `{expected}` but got `{out}` instead."
local_resolver.fail("sudo -u unauthorizeduser -- unbound-control list_forwards")