Skip to content
Snippets Groups Projects
Commit fa3bb7f2 authored by Florian Sesser's avatar Florian Sesser
Browse files

VPN: make endpoint setting mandatory

parent 2c1fd164
No related branches found
No related tags found
3 merge requests!101Merge staging into production,!100Merge develop into staging,!87Add monitoring VPN modules and config
Pipeline #598 passed
......@@ -2,6 +2,7 @@
, "ristrettoSigningKeyPath": "../../PrivateStorageSecrets/ristretto.signing-key"
, "stripeSecretKeyPath": "../../PrivateStorageSecrets/privatestorageio-testing-stripe.secret"
, "monitoringvpnKeyDir": "../../PrivateStorageSecrets/monitoringvpn"
, "monitoringvpnEndpoint": "192.168.67.24:51820"
, "passValue": 1000000
, "issuerDomain": "payments.localdev"
, "letsEncryptAdminEmail": "florian@privatestorage.io"
......
......@@ -9,11 +9,13 @@
, publicIPv4
, monitoringvpnKeyDir ? null
, monitoringvpnIPv4 ? null
, monitoringvpnEndpoint ? null
, ...
}: let
enableVpn = monitoringvpnKeyDir != null &&
monitoringvpnIPv4 != null;
monitoringvpnIPv4 != null &&
monitoringvpnEndpoint != null;
vpnSecrets = if !enableVpn then {} else {
"monitoringvpn-secret-key" = {
......@@ -82,5 +84,6 @@ in rec {
services.private-storage.monitoring.vpn.client = if !enableVpn then {} else {
enable = true;
ip = monitoringvpnIPv4;
endpoint = monitoringvpnEndpoint;
};
}
......@@ -7,10 +7,12 @@
, stateVersion
, monitoringvpnKeyDir ? null
, monitoringvpnIPv4 ? null
, monitoringvpnEndpoint ? null
, ... }: let
enableVpn = monitoringvpnKeyDir != null &&
monitoringvpnIPv4 != null;
monitoringvpnIPv4 != null &&
monitoringvpnEndpoint != null;
vpnSecrets = if !enableVpn then {} else {
"monitoringvpn-secret-key" = {
......@@ -71,5 +73,6 @@ in rec {
services.private-storage.monitoring.vpn.client = if !enableVpn then {} else {
enable = true;
ip = monitoringvpnIPv4;
endpoint = monitoringvpnEndpoint;
};
}
......@@ -42,7 +42,6 @@ in {
endpoint = lib.mkOption {
type = lib.types.str;
example = lib.literalExample "vpn.monitoring.private.storage:54321";
default = "192.168.67.24:51820";
description = ''
The address and port number of the server to establish the VPN with.
'';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment