From 28e524e44c9ffb415195a5b7d50deea73bad484d Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@privatestorage.io>
Date: Thu, 3 Jun 2021 05:35:33 +0000
Subject: [PATCH] So focused on a funny commit message I forgot to add half of
the changes
---
morph/grid/local/grid.nix | 2 +-
morph/grid/production/grid.nix | 2 +-
morph/grid/testing/grid.nix | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index 4f9ec173..a762186d 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 ./users.nix;
+ sshUsers = import ./secrets/users.nix;
vpnClientIPs = [ "172.23.23.11" "172.23.23.12" "172.23.23.13" ]; # TBD: derive automatically
# Get absolute vpn key directory path, as a string:
monitoringvpnKeyDir = toString ./. + "/${cfg.monitoringvpnKeyDir}";
diff --git a/morph/grid/production/grid.nix b/morph/grid/production/grid.nix
index 69a17602..f5735d25 100644
--- a/morph/grid/production/grid.nix
+++ b/morph/grid/production/grid.nix
@@ -6,7 +6,7 @@ import ../../lib/make-grid.nix {
config = ./config.json;
nodes = cfg:
let
- sshUsers = import ./users.nix;
+ sshUsers = import ./secrets/users.nix;
in {
# Here are the hosts that are in this morph network. This is sort of like
# a server manifest. We try to keep as many of the specific details as
diff --git a/morph/grid/testing/grid.nix b/morph/grid/testing/grid.nix
index 90acab60..065cd5fa 100644
--- a/morph/grid/testing/grid.nix
+++ b/morph/grid/testing/grid.nix
@@ -6,7 +6,7 @@ import ../../lib/make-grid.nix {
config = ./config.json;
nodes = cfg:
let
- sshUsers = import ./users.nix;
+ sshUsers = import ./secrets/users.nix;
in {
"payments" = import ../../lib/make-issuer.nix ({
publicIPv4 = "18.194.183.13";
--
GitLab