diff options
author | Kjetil Orbekk <kj@orbekk.com> | 2022-05-31 06:24:05 -0400 |
---|---|---|
committer | Kjetil Orbekk <kj@orbekk.com> | 2022-05-31 06:24:05 -0400 |
commit | 156f13bc5d3358c2010d53973260da0f610d3cc4 (patch) | |
tree | 8f3d2b9b580001311272a15688ed648958a72211 | |
parent | e3e195c8ca3c9ae0742181ee80d0abb2f7909e15 (diff) |
Update vpn
-rw-r--r-- | config/router.nix | 2 | ||||
-rw-r--r-- | modules/vpn.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/router.nix b/config/router.nix index 28d0f30..689f9b2 100644 --- a/config/router.nix +++ b/config/router.nix @@ -4,7 +4,7 @@ let lan-dev = "bond0"; # config.orbekk.nycmesh.listenPort wireguardPorts = - [ config.orbekk.mullvad.listenPort ]; + [ config.orbekk.mullvad.listenPort config.orbekk.vpn.listenPort ]; mullvadMark = 30; # nycmeshMark = 32; aliases = import ../data/aliases.nix; diff --git a/modules/vpn.nix b/modules/vpn.nix index f232e14..f3918be 100644 --- a/modules/vpn.nix +++ b/modules/vpn.nix @@ -27,7 +27,7 @@ let mkPeer = hostConfig: { inherit (hostConfig) publicKey endpoint; - allowedIPs = (lib.optionals (!hostConfig.server) [ "0.0.0.0/0" "::/0" ]); + allowedIPs = (lib.optionals (!hostConfig.server && !cfg.is_server) [ "0.0.0.0/0" "::/0" ]); }; getPeers = host: |