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

Merge pull request #62671 from kfiz/networking-proxy_arp-fix

Browse Source 
tasks/network-interfaces.nix: Enable ip_forwarding for ipv4 and p…
This commit is contained in:
Florian Klink 2020-05-31 22:22:49 +02:00 committed by GitHub
commit 4cd605f3ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/tasks/network-interfaces.nix
View File

@ -283,7 +283,7 @@ let
default = false; default = false;
type = types.bool; type = types.bool;
description = '' description = ''
Turn on proxy_arp for this device (and proxy_ndp for ipv6). Turn on proxy_arp for this device.
This is mainly useful for creating pseudo-bridges between a real This is mainly useful for creating pseudo-bridges between a real
interface and a virtual network such as VPN or a virtual machine for interface and a virtual network such as VPN or a virtual machine for
interfaces that don't support real bridging (most wlan interfaces). interfaces that don't support real bridging (most wlan interfaces).
@ -1065,11 +1065,11 @@ in
optionalString hasBonds "options bonding max_bonds=0"; optionalString hasBonds "options bonding max_bonds=0";
boot.kernel.sysctl = { boot.kernel.sysctl = {
"net.ipv4.conf.all.forwarding" = mkDefault (any (i: i.proxyARP) interfaces);
"net.ipv6.conf.all.disable_ipv6" = mkDefault (!cfg.enableIPv6); "net.ipv6.conf.all.disable_ipv6" = mkDefault (!cfg.enableIPv6);
"net.ipv6.conf.default.disable_ipv6" = mkDefault (!cfg.enableIPv6); "net.ipv6.conf.default.disable_ipv6" = mkDefault (!cfg.enableIPv6);
"net.ipv6.conf.all.forwarding" = mkDefault (any (i: i.proxyARP) interfaces);
} // listToAttrs (flip concatMap (filter (i: i.proxyARP) interfaces) } // listToAttrs (flip concatMap (filter (i: i.proxyARP) interfaces)
(i: forEach [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${replaceChars ["."] ["/"] i.name}.proxy_arp" true))) (i: [(nameValuePair "net.ipv4.conf.${replaceChars ["."] ["/"] i.name}.proxy_arp" true)]))
// listToAttrs (forEach interfaces // listToAttrs (forEach interfaces
(i: let (i: let
opt = i.tempAddress; opt = i.tempAddress;