From ce5b5799aa2905261b312ab1a2c4194a041ec53f Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Fri, 17 Jun 2022 15:07:18 +0000
Subject: [PATCH] Fix VPN key generation script
Co-Authored-By: Jean-Paul Calderone <jean-paul@privatestorage.io>
---
tools/get-vpn-config.nix | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/tools/get-vpn-config.nix b/tools/get-vpn-config.nix
index 7753292a..11fb9ba3 100644
--- a/tools/get-vpn-config.nix
+++ b/tools/get-vpn-config.nix
@@ -9,11 +9,9 @@
{ pathToGrid }:
let
grid = import pathToGrid;
- vpnConfig = node: node.services.private-storage.monitoring.vpn or null;
- vpnClientIP = node: (vpnConfig node).client.ip or null;
- vpnServerIP = node: (vpnConfig node).server.ip or null;
-in
+ vpnIP = node: node.config.grid.monitoringvpnIPv4 or null; # "or null" since "network" in grid doesn't have a monitoringIPv4
+in rec
{
- "serverIP" = vpnServerIP grid.monitoring;
- "clientIPs" = builtins.filter (x: x != null) (map vpnClientIP (builtins.attrValues grid));
+ serverIP = vpnIP grid.monitoring;
+ clientIPs = builtins.filter (x: x != serverIP && x != null) (map vpnIP (builtins.attrValues grid));
}
--
GitLab