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

Remove deprecated

Browse source 
See https://github.com/NixOS/nixpkgs/pull/312472.

This nixpkgs PR (targeting 24.11) broke merging of attributes in the
deprecated attrset. As the deprecated attrset is likely to be removed
altogether soon, instead of reporting upstream, and all our >24.05
systems are in randomcat's repo for now, we judged that the course of
least resistance was just to patch the config on a separate branch
until 24.11 is released.
This commit is contained in:
Katherina Walshe-Grey 2024-11-11 20:32:38 +00:00
parent ffe25bd95a
commit fa0f559d3b
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
peering.nix
View file

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