diff options
author | Robert Hensing <robert@roberthensing.nl> | 2022-10-06 16:22:27 +0200 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2022-10-06 16:24:38 +0200 |
commit | 06a1a2946776aa5b50ac355c7641d23b17c9546e (patch) | |
tree | 9459df1c11a34efd6c9cfdacc2d0e1de2f771a95 | |
parent | 185f12d96f46460e77589a079b079fd1d037b736 (diff) | |
download | nixpkgs-06a1a2946776aa5b50ac355c7641d23b17c9546e.tar nixpkgs-06a1a2946776aa5b50ac355c7641d23b17c9546e.tar.gz nixpkgs-06a1a2946776aa5b50ac355c7641d23b17c9546e.tar.bz2 nixpkgs-06a1a2946776aa5b50ac355c7641d23b17c9546e.tar.lz nixpkgs-06a1a2946776aa5b50ac355c7641d23b17c9546e.tar.xz nixpkgs-06a1a2946776aa5b50ac355c7641d23b17c9546e.tar.zst nixpkgs-06a1a2946776aa5b50ac355c7641d23b17c9546e.zip |
nixos/flannel: Refactor to use config.networking.fqdnOrHostName
-rw-r--r-- | nixos/modules/services/networking/flannel.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index c19e51e5aa6..6ed4f78ddc9 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -92,10 +92,8 @@ in { Needed when running with Kubernetes as backend as this cannot be auto-detected"; ''; type = types.nullOr types.str; - default = with config.networking; (hostName + optionalString (domain != null) ".${domain}"); - defaultText = literalExpression '' - with config.networking; (hostName + optionalString (domain != null) ".''${domain}") - ''; + default = config.networking.fqdnOrHostName; + defaultText = literalExpression "config.networking.fqdnOrHostName"; example = "node1.example.com"; }; |