diff options
| author | Jörg Thalheim <joerg@higgsboson.tk> | 2016-10-03 16:51:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 16:51:02 +0200 |
| commit | 3dbecd4f910fb1a2da2eec2aecad4a9b2099a3ba (patch) | |
| tree | 9d83c0cc4559d27fed255ef598cc3cdda929473c /nixos/modules | |
| parent | c2e849b64d1f97b69679e84a6c3fca17a9876c9e (diff) | |
| parent | 4792af66c3a70ae4b21e45a7fbd2cf6462cd6a69 (diff) | |
| download | nixlib-3dbecd4f910fb1a2da2eec2aecad4a9b2099a3ba.tar nixlib-3dbecd4f910fb1a2da2eec2aecad4a9b2099a3ba.tar.gz nixlib-3dbecd4f910fb1a2da2eec2aecad4a9b2099a3ba.tar.bz2 nixlib-3dbecd4f910fb1a2da2eec2aecad4a9b2099a3ba.tar.lz nixlib-3dbecd4f910fb1a2da2eec2aecad4a9b2099a3ba.tar.xz nixlib-3dbecd4f910fb1a2da2eec2aecad4a9b2099a3ba.tar.zst nixlib-3dbecd4f910fb1a2da2eec2aecad4a9b2099a3ba.zip | |
Merge pull request #19185 from Mic92/networking
networking: enable "multi on" in resolver settings
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/config/networking.nix | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 952f62569c93..fdc782b0579e 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -29,6 +29,19 @@ in ''; }; + networking.hostConf = lib.mkOption { + type = types.lines; + default = "multi on"; + example = '' + multi on + reorder on + trim lan + ''; + description = '' + The contents of <filename>/etc/host.conf</filename>. See also <citerefentry><refentrytitle>host.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>. + ''; + }; + networking.dnsSingleRequest = lib.mkOption { type = types.bool; default = false; @@ -171,6 +184,9 @@ in ${cfg.extraHosts} ''; + # /etc/host.conf: resolver configuration file + "host.conf".text = cfg.hostConf; + # /etc/resolvconf.conf: Configuration for openresolv. "resolvconf.conf".text = '' |