SebastianStork/nixos-config
1
0
Fork 0
mirror of https://github.com/SebastianStork/nixos-config.git synced 2026-03-23 13:28:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: SebastianStork:f93908d1570c2c0c21f50a1b2043e407f5e751f2
Branches Tags
SebastianStork:main
SebastianStork:dependabot/github_actions/cachix/cachix-action-17
SebastianStork:deploy
SebastianStork:deployed/srv-core
SebastianStork:deployed/vps-ns
SebastianStork:deployed/vps-www
SebastianStork:testing-srv-core
..
compare: SebastianStork:4cd24ddfc4d6499ccfb44c16152d5d959ca716c0
Branches Tags
SebastianStork:dependabot/github_actions/cachix/cachix-action-17
SebastianStork:deploy
SebastianStork:deployed/srv-core
SebastianStork:deployed/vps-ns
SebastianStork:deployed/vps-www
SebastianStork:main
SebastianStork:testing-srv-core

No commits in common. "f93908d1570c2c0c21f50a1b2043e407f5e751f2" and "4cd24ddfc4d6499ccfb44c16152d5d959ca716c0" have entirely different histories.
f93908d157 ... 4cd24ddfc4

1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/system/services/nebula/default.nix
View file

@ -9,11 +9,6 @@ let
netCfg = config.custom.networking; netCfg = config.custom.networking;
publicPort = 47141; publicPort = 47141;
lighthouses =
netCfg.peers
|> lib.filter (peer: peer.overlay.isLighthouse)
|> lib.map (lighthouse: lighthouse.overlay.address);
in in
{ {
options.custom.services.nebula = { options.custom.services.nebula = {
@ -76,16 +71,14 @@ in
key = config.sops.secrets."nebula/host-key".path; key = config.sops.secrets."nebula/host-key".path;
tun.device = netCfg.overlay.interface; tun.device = netCfg.overlay.interface;
listen = { listen.port = lib.mkIf netCfg.underlay.isPublic publicPort;
host = lib.mkIf (netCfg.underlay.address != null) netCfg.underlay.address;
port = lib.mkIf netCfg.underlay.isPublic publicPort;
};
inherit (netCfg.overlay) isLighthouse; inherit (netCfg.overlay) isLighthouse;
lighthouses = lib.mkIf (!netCfg.overlay.isLighthouse) lighthouses; lighthouses = lib.mkIf (!netCfg.overlay.isLighthouse) (
netCfg.peers
isRelay = netCfg.overlay.isLighthouse; |> lib.filter (peer: peer.overlay.isLighthouse)
relays = lib.mkIf (!netCfg.overlay.isLighthouse) lighthouses; |> lib.map (lighthouse: lighthouse.overlay.address)
);
staticHostMap = staticHostMap =
netCfg.peers netCfg.peers