nixos/unbound: Fix deprecation warnings

Changed files
+8 -8
nixos
tests
+8 -8
nixos/tests/unbound.nix
···
{
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
];
}
];
···
"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:
···
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; }
···
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()
···
).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")