alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Added networking.hosts and networking.fqdn options

Browse source
This commit is contained in:
Valentin Shirokov 2017-07-08 21:13:16 +03:00
parent f9ec52dedc
commit 5f2826fbed
1 changed files with 36 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,24 +20,35 @@ in
options = {
networking.extraLocalHosts = lib.mkOption {
type = types.listOf types.str;
default = [];
example = [ "localhost.localdomain" "workinprogress.example.com" ];
networking.fqdn = lib.mkOption {
type = types.nullOr types.str;
default = null;
example = "foo.example.com";
description = ''
Additional entries to be appended to 127.0.0.1 entry in <filename>/etc/hosts</filename>.
Full qualified domain name, if any.
'';
};
networking.hosts = lib.mkOption {
type = types.attrsOf ( types.listOf types.str );
default = {};
example = ''
{
"localhost" = [ "foo.bar" ];
"192.168.0.2" = [ "fileserver.local" "nameserver.local" ];
};
'';
description = ''
Locally defined maps of IP addresses to hostnames'
'';
};
networking.extraHosts = lib.mkOption {
type = types.lines;
default = "";
example = "192.168.0.1 lanlocalhost";
description = ''
Additional entries to be appended to <filename>/etc/hosts</filename>.
Note that entries for 127.0.0.1 will not always work correctly if added from here.
They should be added via <literal>networking.extraLocalHosts</literal>.
Additional verbatim entries to be appended to <filename>/etc/hosts</filename>.
'';
};
@ -199,12 +210,26 @@ in
"rpc".source = pkgs.glibc.out + "/etc/rpc";
# /etc/hosts: Hostname-to-IP mappings.
"hosts".text = let foo = concatStringsSep " " cfg.extraLocalHosts; in
"hosts".text =
let oneToString = set : ip : ip + " " + concatStringsSep " " ( getAttr ip set );
allToString = set : concatStringsSep "\n" ( map ( oneToString set ) ( builtins.attrNames set ));
userLocalHosts =
if builtins.hasAttr "127.0.0.1" cfg.hosts
then concatStringsSep " " ( filter (x : x != "localhost" ) ( getAttr "127.0.0.1" cfg.hosts))
else "";
userLocalHosts6 =
if builtins.hasAttr "::1" cfg.hosts
then concatStringsSep " " ( filter (x : x != "localhost" ) ( getAttr "::1" cfg.hosts))
else "";
otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]);
maybeFQDN = if cfg.fqdn == null then "" else cfq.fqdn;
in
''
127.0.0.1 localhost ${foo}
127.0.0.1 ${maybeFQDN} ${userLocalHosts} localhost
${optionalString cfg.enableIPv6 ''
::1 localhost ${foo}
::1 ${maybeFQDN} ${userLocalHosts6} localhost
''}
${otherHosts}
${cfg.extraHosts}
'';