diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-11-14 12:12:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-14 12:12:59 +0100 |
commit | 06d0ba1ee9e45f6b1e2b7546ff96c59a55fffe24 (patch) | |
tree | b686ed0b8e3b2dd5ee5995448d167a1a20b946d2 /nixos/modules/services/networking | |
parent | aeff3080d02ce6ac2b2ad0b0029c1388eab2d8c7 (diff) | |
parent | 5feed06535ec3c3949c298e74ff7d7fa335ee567 (diff) | |
download | nixlib-06d0ba1ee9e45f6b1e2b7546ff96c59a55fffe24.tar nixlib-06d0ba1ee9e45f6b1e2b7546ff96c59a55fffe24.tar.gz nixlib-06d0ba1ee9e45f6b1e2b7546ff96c59a55fffe24.tar.bz2 nixlib-06d0ba1ee9e45f6b1e2b7546ff96c59a55fffe24.tar.lz nixlib-06d0ba1ee9e45f6b1e2b7546ff96c59a55fffe24.tar.xz nixlib-06d0ba1ee9e45f6b1e2b7546ff96c59a55fffe24.tar.zst nixlib-06d0ba1ee9e45f6b1e2b7546ff96c59a55fffe24.zip |
Merge pull request #31477 from andir/fix-babeld-config
Fix babeld config
Diffstat (limited to 'nixos/modules/services/networking')
-rw-r--r-- | nixos/modules/services/networking/babeld.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix index dd76bac9df76..3dfd80f6ff52 100644 --- a/nixos/modules/services/networking/babeld.nix +++ b/nixos/modules/services/networking/babeld.nix @@ -6,8 +6,10 @@ let cfg = config.services.babeld; + conditionalBoolToString = value: if (isBool value) then (boolToString value) else (toString value); + paramsString = params: - concatMapStringsSep "" (name: "${name} ${boolToString (getAttr name params)}") + concatMapStringsSep " " (name: "${name} ${conditionalBoolToString (getAttr name params)}") (attrNames params); interfaceConfig = name: @@ -49,7 +51,7 @@ in type = types.nullOr (types.attrsOf types.unspecified); example = { - wired = true; + type = "tunnel"; "split-horizon" = true; }; }; @@ -63,7 +65,7 @@ in type = types.attrsOf (types.attrsOf types.unspecified); example = { enp0s2 = - { wired = true; + { type = "wired"; "hello-interval" = 5; "split-horizon" = "auto"; }; |