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

Removed networking.fqdn option

Browse Source 
Adding it was a mistake which can only lead to problems and confusion.
This commit is contained in:
Valentin Shirokov 2017-07-31 17:58:03 +08:00 committed by Robin Gloster
parent 9082b66096
commit d30b2eb1c0
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,15 +20,6 @@ in
options = { options = {
networking.fqdn = lib.mkOption {
type = types.nullOr types.str;
default = null;
example = "foo.example.com";
description = ''
Fully qualified domain name, if any.
'';
};
networking.hosts = lib.mkOption { networking.hosts = lib.mkOption {
type = types.attrsOf ( types.listOf types.str ); type = types.attrsOf ( types.listOf types.str );
default = {}; default = {};
@ -220,12 +211,11 @@ in
( builtins.hasAttr "::1" cfg.hosts ) ( builtins.hasAttr "::1" cfg.hosts )
( concatStringsSep " " ( remove "localhost" cfg.hosts."::1" )); ( concatStringsSep " " ( remove "localhost" cfg.hosts."::1" ));
otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]); otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]);
maybeFQDN = optionalString ( cfg.fqdn != null ) cfg.fqdn;
in in
'' ''
127.0.0.1 ${maybeFQDN} ${userLocalHosts} localhost 127.0.0.1 ${userLocalHosts} localhost
${optionalString cfg.enableIPv6 '' ${optionalString cfg.enableIPv6 ''
::1 ${maybeFQDN} ${userLocalHosts6} localhost ::1 ${userLocalHosts6} localhost
''} ''}
${otherHosts} ${otherHosts}
${cfg.extraHosts} ${cfg.extraHosts}