qenya/birdsong
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: qenya:91ed1abe655ac270be4e6f6c006af6fa4edd25bf
Branches Tags
qenya:main
qenya:compat-24.11
qenya:networkd-wireguard-privatekey-credential
qenya:systemd-networkd
..
compare: qenya:25a90c1b33d76845252fdd9381e5b114604253b5
Branches Tags
qenya:main
qenya:compat-24.11
qenya:networkd-wireguard-privatekey-credential
qenya:systemd-networkd

No commits in common. "91ed1abe655ac270be4e6f6c006af6fa4edd25bf" and "25a90c1b33d76845252fdd9381e5b114604253b5" have entirely different histories.
91ed1abe65 ... 25a90c1b33

1 changed files with 7 additions and 5 deletions
Show stats Expand all files Collapse all files

12
peering.nix
View file

@ -93,11 +93,13 @@ in
in in
mapAttrsToList mapAttrsToList
(name: peer: { (name: peer: {
PublicKey = peer.wireguardKey; wireguardPeerConfig = {
AllowedIPs = [ peer.ipv4 peer.ipv6 ] PublicKey = peer.wireguardKey;
++ optionals peer.isRouter [ "10.127.0.0/16" "fd70:81ca:0f8f::/48" ]; AllowedIPs = [ peer.ipv4 peer.ipv6 ]
Endpoint = mkIf (canDirectPeer host peer) "${peer.endpoint}:${toString peer.port}"; ++ optionals peer.isRouter [ "10.127.0.0/16" "fd70:81ca:0f8f::/48" ];
PersistentKeepalive = mkIf (peer.subnet != host.subnet) cfg.persistentKeepalive; Endpoint = mkIf (canDirectPeer host peer) "${peer.endpoint}:${toString peer.port}";
PersistentKeepalive = mkIf (peer.subnet != host.subnet) cfg.persistentKeepalive;
};
}) })
(filterAttrs (name: peer: peer != host && (canDirectPeer host peer || canDirectPeer peer host)) hosts); (filterAttrs (name: peer: peer != host && (canDirectPeer host peer || canDirectPeer peer host)) hosts);
}; };