From 296d219ac0dde1abcd65db2b9b5cd33c19ece8c0 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@privatestorage.io>
Date: Sun, 16 May 2021 20:45:52 +0000
Subject: [PATCH] vpn client: use more defaults
---
morph/lib/make-issuer.nix | 2 --
nixos/modules/monitoring/vpn/client.nix | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/morph/lib/make-issuer.nix b/morph/lib/make-issuer.nix
index 11d1b626..15c8f58f 100644
--- a/morph/lib/make-issuer.nix
+++ b/morph/lib/make-issuer.nix
@@ -71,8 +71,6 @@
services.private-storage.monitoring.vpn.client = {
enable = true;
- privateKeyFile = /var/secrets/monitoringvpn/client.key;
ip = "172.23.23.11";
- endpointPublicKeyFile = /home/flo/Repositories/PrivateStorageio/morph/PrivateStorageSecrets/monitoringvpn/server.pub;
};
}
diff --git a/nixos/modules/monitoring/vpn/client.nix b/nixos/modules/monitoring/vpn/client.nix
index 2515e535..40cc0516 100644
--- a/nixos/modules/monitoring/vpn/client.nix
+++ b/nixos/modules/monitoring/vpn/client.nix
@@ -55,6 +55,7 @@ in {
endpointPublicKeyFile = lib.mkOption {
type = lib.types.path;
example = lib.literalExample /var/secrets/monitoringvpn/server.pub;
+ default = ../../../../morph/PrivateStorageSecrets/monitoringvpn/server.pub;
description = ''
File with base64 public key generated by <command>cat private.key | wg pubkey > pubkey.pub</command>.
'';
--
GitLab