diff options
| author | Valentin Shirokov <regellosigkeitsaxiom@yandex.ru> | 2017-07-31 17:58:03 +0800 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-07-31 13:55:41 +0200 |
| commit | d30b2eb1c0458f5ede751956effe714f5c1a925b (patch) | |
| tree | 4f4a41d85eb5e84fde085a371280af5dda055eaf /nixos/modules | |
| parent | 9082b660965f8f57c1a2f61c0bdd4f6df7cf862b (diff) | |
| download | nixlib-d30b2eb1c0458f5ede751956effe714f5c1a925b.tar nixlib-d30b2eb1c0458f5ede751956effe714f5c1a925b.tar.gz nixlib-d30b2eb1c0458f5ede751956effe714f5c1a925b.tar.bz2 nixlib-d30b2eb1c0458f5ede751956effe714f5c1a925b.tar.lz nixlib-d30b2eb1c0458f5ede751956effe714f5c1a925b.tar.xz nixlib-d30b2eb1c0458f5ede751956effe714f5c1a925b.tar.zst nixlib-d30b2eb1c0458f5ede751956effe714f5c1a925b.zip | |
Removed networking.fqdn option
Adding it was a mistake which can only lead to problems and confusion.
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/config/networking.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index b3639037914b..619f36cd5150 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -20,15 +20,6 @@ in 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 { type = types.attrsOf ( types.listOf types.str ); default = {}; @@ -220,12 +211,11 @@ in ( builtins.hasAttr "::1" cfg.hosts ) ( concatStringsSep " " ( remove "localhost" cfg.hosts."::1" )); otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]); - maybeFQDN = optionalString ( cfg.fqdn != null ) cfg.fqdn; in '' - 127.0.0.1 ${maybeFQDN} ${userLocalHosts} localhost + 127.0.0.1 ${userLocalHosts} localhost ${optionalString cfg.enableIPv6 '' - ::1 ${maybeFQDN} ${userLocalHosts6} localhost + ::1 ${userLocalHosts6} localhost ''} ${otherHosts} ${cfg.extraHosts} |