Deuxfleurs/nixcfg
17
6
Fork 2
Code Issues 15 Pull requests 2 Projects Releases Wiki Activity

Simplify network configuration #11

Merged
lx merged 25 commits from simplify-network-config into main 2023-05-16 13:19:33 +00:00
Conversation 0 Commits 25 Files changed 43 +8 -1
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6c07a42978 - Show all commits

2
cluster/staging/cluster.nix
View file

@ -38,6 +38,8 @@
endpoint = "bitfrost.fiber.shirokumo.net:33734"; endpoint = "bitfrost.fiber.shirokumo.net:33734";
}; };
}; };
deuxfleurs.wgautomeshPort = 1667;
services.wgautomesh.logLevel = "debug"; services.wgautomesh.logLevel = "debug";
# Bootstrap IPs for Consul cluster, # Bootstrap IPs for Consul cluster,

7
nix/deuxfleurs.nix
View file

@ -117,6 +117,11 @@ in
type = port; type = port;
default = 33799; default = 33799;
}; };
wgautomeshPort = mkOption {
description = "Gossip port for wgautomesh";
type = port;
default = 1666;
};
}; };
imports = [ imports = [
@ -245,7 +250,7 @@ in
services.wgautomesh = { services.wgautomesh = {
enable = true; enable = true;
interface = "wg0"; interface = "wg0";
gossipPort = 1666; gossipPort = cfg.wgautomeshPort;
gossipSecretFile = "/var/lib/wgautomesh/gossip_secret"; gossipSecretFile = "/var/lib/wgautomesh/gossip_secret";
persistFile = "/var/lib/wgautomesh/state"; persistFile = "/var/lib/wgautomesh/state";
upnpForwardPublicPort = upnpForwardPublicPort =