Merge pull request #9683 from ts468/upstream.resolvconf

nixos networking module: resolvconf + dnsmasq

ts468 54acc6ad ee7e17c6

Changed files
+11
nixos
modules
+11
nixos/modules/config/networking.nix
···
'';
};
+
networking.extraResolvconfConf = lib.mkOption {
+
type = types.lines;
+
default = "";
+
example = "libc=NO";
+
description = ''
+
Extra configuration to append to <filename>resolvconf.conf</filename>.
+
'';
+
};
+
+
networking.proxy = {
default = lib.mkOption {
···
'' + optionalString dnsmasqResolve ''
dnsmasq_conf=/etc/dnsmasq-conf.conf
dnsmasq_resolv=/etc/dnsmasq-resolv.conf
+
'' + cfg.extraResolvconfConf + ''
'';
} // (optionalAttrs config.services.resolved.enable (