movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/lib/testing: fix network module

Browse source 
This fixes acme tests.

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
This commit is contained in:
John Titor 2025-06-08 14:16:36 +05:30
parent 8207ad0d50
commit 35fb55d21b
No known key found for this signature in database
GPG key ID: 29B0514F4E3C1CC0
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
nixos/lib/testing/network.nix
View file

@ -13,6 +13,7 @@ let
nameValuePair nameValuePair
optionalAttrs optionalAttrs
optionalString optionalString
optionals
range range
toLower toLower
types types
@ -95,16 +96,18 @@ let
name: config: name: config:
let let
hostnames = hostnames =
optionalString ( [
config.networking.domain != null "${config.networking.hostName}"
) "${config.networking.hostName}.${config.networking.domain} " ]
+ "${config.networking.hostName}\n"; ++ optionals (config.networking.domain != null) [
"${config.networking.hostName}.${config.networking.domain}"
];
in in
optionalAttrs (config.networking.primaryIPAddress != "") { optionalAttrs (config.networking.primaryIPAddress != "") {
"${config.networking.primaryIPAddress}" = [ hostnames ]; "${config.networking.primaryIPAddress}" = hostnames;
} }
// optionalAttrs (config.networking.primaryIPv6Address != "") { // optionalAttrs (config.networking.primaryIPv6Address != "") {
"${config.networking.primaryIPv6Address}" = [ hostnames ]; "${config.networking.primaryIPv6Address}" = hostnames;
} }
) nodes; ) nodes;