gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #272946 from benaryorg/resolved_no_fallback

Browse Source 
nixos/resolved: Allow upstream fallback override
This commit is contained in:
Florian Klink
2023-12-20 12:55:44 +02:00
committed by GitHub
parent b5556f2c37 c3256929e9
commit c28f238f5a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/system/boot/resolved.nix
View File

@@ -23,12 +23,13 @@ in
};
services.resolved.fallbackDns = mkOption {
default = [ ];
default = null;
example = [ "8.8.8.8" "2001:4860:4860::8844" ];
type = types.listOf types.str;
type = types.nullOr (types.listOf types.str);
description = lib.mdDoc ''
A list of IPv4 and IPv6 addresses to use as the fallback DNS servers.
If this option is empty, a compiled-in list of DNS servers is used instead.
If this option is null, a compiled-in list of DNS servers is used instead.
Setting this option to an empty list will override the built-in list to an empty list, disabling fallback.
'';
};
@@ -134,7 +135,7 @@ in
[Resolve]
${optionalString (config.networking.nameservers != [])
"DNS=${concatStringsSep " " config.networking.nameservers}"}
${optionalString (cfg.fallbackDns != [])
${optionalString (cfg.fallbackDns != null)
"FallbackDNS=${concatStringsSep " " cfg.fallbackDns}"}
${optionalString (cfg.domains != [])
"Domains=${concatStringsSep " " cfg.domains}"}