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

Merge pull request #9683 from ts468/upstream.resolvconf

Browse Source 
nixos networking module: resolvconf + dnsmasq
This commit is contained in:
ts468 2015-09-26 18:50:31 +02:00
commit 54acc6ada3
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/config/networking.nix
View File

@ -39,6 +39,16 @@ in
''; '';
}; };
networking.extraResolvconfConf = lib.mkOption {
type = types.lines;
default = "";
example = "libc=NO";
description = ''
Extra configuration to append to <filename>resolvconf.conf</filename>.
'';
};
networking.proxy = { networking.proxy = {
default = lib.mkOption { default = lib.mkOption {
@ -150,6 +160,7 @@ in
'' + optionalString dnsmasqResolve '' '' + optionalString dnsmasqResolve ''
dnsmasq_conf=/etc/dnsmasq-conf.conf dnsmasq_conf=/etc/dnsmasq-conf.conf
dnsmasq_resolv=/etc/dnsmasq-resolv.conf dnsmasq_resolv=/etc/dnsmasq-resolv.conf
'' + cfg.extraResolvconfConf + ''
''; '';
} // (optionalAttrs config.services.resolved.enable ( } // (optionalAttrs config.services.resolved.enable (