mirror of
https://github.com/ellmau/nixos.git
synced 2025-12-19 09:29:36 +01:00
Add extraAllowedIps option to wireguard module
This commit is contained in:
parent
4bce59f602
commit
28d583c43c
@ -59,6 +59,12 @@
|
||||
type = types.str;
|
||||
description = "Wireguard public key for this peer";
|
||||
};
|
||||
|
||||
additionalAllowedIps = mkOption{
|
||||
type = types.listOf types.str;
|
||||
description = "Additional IPs to add to allowedIPs ";
|
||||
default = [ ];
|
||||
};
|
||||
};
|
||||
});
|
||||
};
|
||||
@ -128,9 +134,9 @@
|
||||
inherit (peer) publicKey;
|
||||
};
|
||||
|
||||
mkPeerPeer = prefixes: peer: {
|
||||
mkPeerPeer = prefixes: peers: peer: {
|
||||
allowedIPs = (mkAddresses prefixes peer.localIp)
|
||||
++ (lib.concatMap (mkAddresses prefixes) peer.extraIps);
|
||||
++ (lib.concatMap (mkAddresses prefixes) peer.extraIps) ++ (if lib.hasAttr hostName peers then peers.${hostName}.additionalAllowedIps else [ ]);
|
||||
persistentKeepalive = 25;
|
||||
inherit (peer) publicKey endpoint;
|
||||
};
|
||||
@ -172,7 +178,7 @@
|
||||
} // (if isServer then {
|
||||
peers = lib.mapAttrsToList (_: mkServerPeer value.prefixes) value.peers;
|
||||
} else if isPeer then {
|
||||
peers = lib.mapAttrsToList (_: mkPeerPeer value.prefixes) value.servers;
|
||||
peers = lib.mapAttrsToList (_: mkPeerPeer value.prefixes value.peers) value.servers;
|
||||
postSetup = mkPostSetup interface value.prefixes value.servers;
|
||||
} else
|
||||
{ }));
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user