privatevoid.net/depot
1
1
Fork 0
Code Issues 23 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

cluster/services/wireguard: use hostLinks

Browse source
This commit is contained in:
Max Headroom 2023-03-22 21:26:02 +01:00
parent 72636cfffb
commit 694bd7d712
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cluster/services/wireguard/default.nix
View file

@ -1,4 +1,4 @@
{ config, depot, ... }:
{ config, depot, lib, ... }:
let
inherit (depot.config) hours;
@ -13,16 +13,11 @@ let
in
{
vars = {
mesh = {
checkmate = config.links.mesh-node-checkmate.extra;
thunderskin = config.links.mesh-node-thunderskin.extra;
VEGAS = config.links.mesh-node-VEGAS.extra;
prophet = config.links.mesh-node-prophet.extra;
};
mesh = lib.genAttrs config.services.wireguard.nodes.mesh (node: config.hostLinks.${node}.mesh.extra);
inherit meshNet;
};
links = {
mesh-node-checkmate = {
hostLinks = {
checkmate.mesh = {
ipv4 = getExtAddr hours.checkmate;
extra = {
meshIp = "10.1.1.32";
@ -32,7 +27,7 @@ in
extraRoutes = [];
};
};
mesh-node-thunderskin = {
thunderskin.mesh = {
ipv4 = getExtAddr hours.thunderskin;
extra = {
meshIp = "10.1.1.4";
@ -42,7 +37,7 @@ in
extraRoutes = [];
};
};
mesh-node-VEGAS = {
VEGAS.mesh = {
ipv4 = getExtAddr hours.VEGAS;
extra = {
meshIp = "10.1.1.5";
@ -52,7 +47,7 @@ in
extraRoutes = [ "${hours.VEGAS.interfaces.vstub.addr}/32" "10.10.0.0/16" ];
};
};
mesh-node-prophet = {
prophet.mesh = {
ipv4 = getExtAddr hours.prophet;
extra = {
meshIp = "10.1.1.9";

4
cluster/services/wireguard/mesh.nix
View file

@ -2,10 +2,10 @@
let
inherit (config.networking) hostName;
link = cluster.config.links."mesh-node-${hostName}";
link = cluster.config.hostLinks.${hostName}.mesh;
mkPeer = peerName: let
peerLink = cluster.config.links."mesh-node-${peerName}";
peerLink = cluster.config.hostLinks.${peerName}.mesh;
in {
publicKey = peerLink.extra.pubKey;
allowedIPs = [ "${peerLink.extra.meshIp}/32" ] ++ peerLink.extra.extraRoutes;