From 679ecdf03cb841b47560021ef20c401a9dcdaee2 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@privatestorage.io>
Date: Sun, 16 May 2021 20:55:14 +0000
Subject: [PATCH] VPN: Add IP parameter
---
morph/grid/local/grid.nix | 2 ++
morph/lib/make-issuer.nix | 3 ++-
morph/lib/make-monitoring.nix | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index 1be6bffc..3df4e271 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -10,6 +10,7 @@ import ../../lib/make-grid.nix {
in {
"payments1" = import ../../lib/make-issuer.nix (rec {
publicIPv4 = "192.168.67.21";
+ monitoringvpnIPv4 = "172.23.23.11";
inherit sshUsers;
hardware = import ./virtual-hardware.nix ({ inherit publicIPv4; });
stateVersion = "19.03";
@@ -31,6 +32,7 @@ import ../../lib/make-grid.nix {
"monitoring1" = import ../../lib/make-monitoring.nix (rec {
publicIPv4 = "192.168.67.24";
+ monitoringvpnIPv4 = "172.23.23.1";
inherit sshUsers;
hardware = import ./virtual-hardware.nix ({ inherit publicIPv4; });
stateVersion = "19.09";
diff --git a/morph/lib/make-issuer.nix b/morph/lib/make-issuer.nix
index 15c8f58f..789ff9d5 100644
--- a/morph/lib/make-issuer.nix
+++ b/morph/lib/make-issuer.nix
@@ -7,6 +7,7 @@
, sshUsers
, stateVersion
, publicIPv4
+, monitoringvpnIPv4
, ...
}: {
deployment = {
@@ -71,6 +72,6 @@
services.private-storage.monitoring.vpn.client = {
enable = true;
- ip = "172.23.23.11";
+ ip = monitoringvpnIPv4;
};
}
diff --git a/morph/lib/make-monitoring.nix b/morph/lib/make-monitoring.nix
index 07fc5f0b..0d8ad9e1 100644
--- a/morph/lib/make-monitoring.nix
+++ b/morph/lib/make-monitoring.nix
@@ -1,4 +1,4 @@
-{ publicIPv4, hardware, publicStoragePort, ristrettoSigningKeyPath, passValue, sshUsers, stateVersion, ... }: rec {
+{ publicIPv4, hardware, publicStoragePort, ristrettoSigningKeyPath, passValue, sshUsers, stateVersion, monitoringvpnIPv4, ... }: rec {
deployment = {
targetHost = publicIPv4;
@@ -38,7 +38,7 @@
services.private-storage.monitoring.vpn.server = {
enable = true;
- ip = "172.23.23.1";
+ ip = monitoringvpnIPv4;
};
system.stateVersion = stateVersion;
--
GitLab