BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

networking config: support setting resolv.conf options

Browse source 
Closes: #11372
This commit is contained in:
Christian Zagrodnick 2015-12-01 07:38:49 +01:00 committed by Joachim Fasting
parent 649b5bceb1
commit 14dfdeb31a
No known key found for this signature in database
GPG key ID: 4330820E1E04DCF4
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
nixos/modules/config/networking.nix
View file

@ -11,6 +11,11 @@ let
config.services.dnsmasq.resolveLocalQueries; config.services.dnsmasq.resolveLocalQueries;
hasLocalResolver = config.services.bind.enable || dnsmasqResolve; hasLocalResolver = config.services.bind.enable || dnsmasqResolve;
resolvconfOptions =
builtins.replaceStrings ["\n"] [" "]
(cfg.resolvconfOptions +
(optionalString cfg.dnsSingleRequest " single-request") +
(optionalString cfg.dnsExtensionMechanism " ends0"));
in in
{ {
@ -59,6 +64,14 @@ in
''; '';
}; };
networking.resolvconfOptions = lib.mkOption {
type = types.lines;
default = "";
example = "ndots:1 rotate";
description = ''
Set the options in <filename>/etc/resolv.conf</filename>.
'';
};
networking.proxy = { networking.proxy = {
@ -171,12 +184,9 @@ in
# Invalidate the nscd cache whenever resolv.conf is # Invalidate the nscd cache whenever resolv.conf is
# regenerated. # regenerated.
libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null' libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null'
'' + optionalString cfg.dnsSingleRequest '' '' + optionalString ((stringLength resolvconfOptions) > 0) ''
# only send one DNS request at a time # Options as described in resolv.conf(5)
resolv_conf_options+=' single-request' resolv_conf_options='${resolvconfOptions}'
'' + optionalString cfg.dnsExtensionMechanism ''
# enable extension mechanisms for DNS
resolv_conf_options+=' edns0'
'' + optionalString hasLocalResolver '' '' + optionalString hasLocalResolver ''
# This hosts runs a full-blown DNS resolver. # This hosts runs a full-blown DNS resolver.
name_servers='127.0.0.1' name_servers='127.0.0.1'