diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-11-12 19:04:12 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-11-17 20:04:56 +0100 |
| commit | e61ef63e4e4644a451a4ed66f2f2ac7b48f2c26a (patch) | |
| tree | c0adef50325c5e4f3c42c38db87c0aa63609e318 /nixos | |
| parent | 3087df3e8f563152c9333e0d3e1b6e74235cde2b (diff) | |
kresd service: switch .listenDoH to new implementation
Beware: extraFeatures are not needed *for this* anymore,
but their removal may still cause a regression in some configs
(example: prefill module).
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/kresd.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index ccb34163d5f3..6f1c4c48b430 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -23,18 +23,14 @@ let ''; configFile = pkgs.writeText "kresd.conf" ( - optionalString (cfg.listenDoH != []) '' - modules.load('http') - '' + "" + concatMapStrings (mkListen "dns") cfg.listenPlain + concatMapStrings (mkListen "tls") cfg.listenTLS - + concatMapStrings (mkListen "doh") cfg.listenDoH + + concatMapStrings (mkListen "doh2") cfg.listenDoH + cfg.extraConfig ); - package = if cfg.listenDoH == [] - then pkgs.knot-resolver # never force `extraFeatures = false` - else pkgs.knot-resolver.override { extraFeatures = true; }; + package = pkgs.knot-resolver; in { meta.maintainers = [ maintainers.vcunat /* upstream developer */ ]; @@ -92,7 +88,7 @@ in { default = []; example = [ "198.51.100.1:443" "[2001:db8::1]:443" "443" ]; description = '' - Addresses and ports on which kresd should provide DNS over HTTPS (see RFC 8484). + Addresses and ports on which kresd should provide DNS over HTTPS/2 (see RFC 8484). For detailed syntax see ListenStream in man systemd.socket. ''; }; |