diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-11-17 20:06:55 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-11-17 20:06:55 +0100 |
commit | bdcd2d82eea6c7f0f1a9eba479e748f90be0e2d3 (patch) | |
tree | 02716db9b7226f9b6a910a2cebf3ee458e2884de /nixos | |
parent | 1491bab2b1113e745f107a36c7b81f89aed8cf1c (diff) | |
parent | 335798d243cc550a6b32a411c63a55f361f9e32f (diff) |
Merge #103633: kresd service: switch .listenDoH
... to new implementation - and a couple other improvements.
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. ''; }; |