colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

wg-home: don't infer role from ip address, but set it explicitly

Browse Source
This commit is contained in:
Colin 2023-09-19 11:38:51 +00:00
parent 9dfcacf8a3
commit 9d1ebd38ce
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hosts/by-name/servo/default.nix
View File

@ -25,6 +25,7 @@
sane.services.dyn-dns.enable = true;
sane.services.wg-home.enable = true;
sane.services.wg-home.enableWan = true;
sane.services.wg-home.routeThroughServo = false;
sane.services.wg-home.ip = config.sane.hosts.by-name."servo".wg-home.ip;
sane.nixcache.substituters.servo = false;
sane.nixcache.substituters.desko = false;

19
hosts/modules/wg-home.nix
View File

@ -38,6 +38,14 @@ in
default = false;
description = "whether to make this port visible on the WAN";
};
sane.services.wg-home.routeThroughServo = mkOption {
type = types.bool;
default = true;
description = ''
whether to contact peers by routing through a stationary server.
should be true for all "clients", and false for that stationary server.
'';
};
sane.services.wg-home.ip = mkOption {
type = types.str;
};
@ -79,12 +87,13 @@ in
all-peers = mapAttrsToList (_: hostcfg: hostcfg.wg-home) config.sane.hosts.by-name;
peer-list = filter (p: p.ip != null && p.ip != cfg.ip && p.pubkey != null) all-peers;
in
if cfg.ip == server-cfg.ip then
# if we're the server, then we maintain the entire client list
mkClientPeers peer-list
if cfg.routeThroughServo then
# if acting as a client, then maintain a single peer -- the server -- which does the actual routing
[ (mkServerPeer peer-list) ]
else
# but if we're a client, we maintain a single peer -- the server -- which does the actual routing
[ (mkServerPeer peer-list) ];
# if acting as a server, route to each peer individually
mkClientPeers peer-list
;
};
};
}