diff --git a/morph/grid/local/.gitignore b/morph/grid/local/.gitignore index 86a37fb6544e909b2b2cd8579d5756d6d2d319da..575bd4ccf65731e58593d576ad7b6bda742faab7 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 c08955eb24d0c7046dbb4862cf7b81d1ca3e0a0a..93779117b49d74315894b6308a027bae50abe0c2 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 6d9a51b2e62002044be0f04990c43e6fa6227b84..ee4a2c15a5e0bc07704de9b5463d295a60ca40c5 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 0000000000000000000000000000000000000000..120e986dbdc2677647217ee24f05c95c223a5e50 --- /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; }