Skip to content

Commit d30b2eb

Browse files
regellosigkeitsaxiomglobin
authored andcommittedJul 31, 2017
Removed networking.fqdn option
Adding it was a mistake which can only lead to problems and confusion.
1 parent 9082b66 commit d30b2eb

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed
 

‎nixos/modules/config/networking.nix

+2-12
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,6 @@ in
2020

2121
options = {
2222

23-
networking.fqdn = lib.mkOption {
24-
type = types.nullOr types.str;
25-
default = null;
26-
example = "foo.example.com";
27-
description = ''
28-
Fully qualified domain name, if any.
29-
'';
30-
};
31-
3223
networking.hosts = lib.mkOption {
3324
type = types.attrsOf ( types.listOf types.str );
3425
default = {};
@@ -220,12 +211,11 @@ in
220211
( builtins.hasAttr "::1" cfg.hosts )
221212
( concatStringsSep " " ( remove "localhost" cfg.hosts."::1" ));
222213
otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]);
223-
maybeFQDN = optionalString ( cfg.fqdn != null ) cfg.fqdn;
224214
in
225215
''
226-
127.0.0.1 ${maybeFQDN} ${userLocalHosts} localhost
216+
127.0.0.1 ${userLocalHosts} localhost
227217
${optionalString cfg.enableIPv6 ''
228-
::1 ${maybeFQDN} ${userLocalHosts6} localhost
218+
::1 ${userLocalHosts6} localhost
229219
''}
230220
${otherHosts}
231221
${cfg.extraHosts}

0 commit comments

Comments
 (0)
Please sign in to comment.