From 337f8c7285be5e8478ebf3eec23ee9c00c7ce133 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@privatestorage.io>
Date: Tue, 1 Jun 2021 18:13:39 +0000
Subject: [PATCH] Apply symlink-to-secrets changes also to local grid
---
morph/grid/local/.gitignore | 2 +-
morph/grid/local/config.json | 6 +++---
morph/grid/local/grid.nix | 2 +-
morph/grid/local/users.nix | 2 ++
4 files changed, 7 insertions(+), 5 deletions(-)
create mode 100644 morph/grid/local/users.nix
diff --git a/morph/grid/local/.gitignore b/morph/grid/local/.gitignore
index 86a37fb6..575bd4cc 100644
--- a/morph/grid/local/.gitignore
+++ b/morph/grid/local/.gitignore
@@ -1,2 +1,2 @@
.vagrant
-
+secrets
diff --git a/morph/grid/local/config.json b/morph/grid/local/config.json
index c08955eb..93779117 100644
--- a/morph/grid/local/config.json
+++ b/morph/grid/local/config.json
@@ -1,7 +1,7 @@
{ "publicStoragePort": 8898
-, "ristrettoSigningKeyPath": "../../PrivateStorageSecrets/ristretto.signing-key"
-, "stripeSecretKeyPath": "../../PrivateStorageSecrets/privatestorageio-testing-stripe.secret"
-, "monitoringvpnKeyDir": "../../PrivateStorageSecrets/monitoringvpn"
+, "ristrettoSigningKeyPath": "./secrets/ristretto.signing-key"
+, "stripeSecretKeyPath": "./secrets/stripe.secret"
+, "monitoringvpnKeyDir": "./secrets/monitoringvpn"
, "monitoringvpnEndpoint": "192.168.67.24:51820"
, "passValue": 1000000
, "issuerDomain": "payments.localdev"
diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index 6d9a51b2..ee4a2c15 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -6,7 +6,7 @@ import ../../lib/make-grid.nix {
config = ./config.json;
nodes = cfg:
let
- sshUsers = import ../../../../PrivateStorageSecrets/localdev-users.nix;
+ sshUsers = import ./users.nix;
vpnClientIPs = [ "172.23.23.11" "172.23.23.12" "172.23.23.13" ]; # TBD: derive automatically
in {
"payments1" = import ../../lib/make-issuer.nix (rec {
diff --git a/morph/grid/local/users.nix b/morph/grid/local/users.nix
new file mode 100644
index 00000000..120e986d
--- /dev/null
+++ b/morph/grid/local/users.nix
@@ -0,0 +1,2 @@
+let key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHx7wJQNqKn8jOC4AxySRL2UxidNp7uIK9ad3pMb1ifF flo@fs-la";
+in { "root" = key; "flo" = key; "vagrant" = key; }
--
GitLab