From 183f9844f063d0ac1a0a898f61778e5854ce3c96 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 15 Mar 2021 15:34:08 -0400
Subject: [PATCH] Allow secrets to be missing
---
morph/grid/testing/grid.nix | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/morph/grid/testing/grid.nix b/morph/grid/testing/grid.nix
index 3a1c5f39..65f97a97 100644
--- a/morph/grid/testing/grid.nix
+++ b/morph/grid/testing/grid.nix
@@ -6,7 +6,12 @@ import ../../lib/make-grid.nix {
config = ./config.json;
nodes = cfg:
let
- sshUsers = import ../../../../PrivateStorageSecrets/staging-users.nix;
+ importDef = default: path: (
+ if builtins.pathExists path
+ then import path
+ else default
+ );
+ sshUsers = importDef {} ../../../../PrivateStorageSecrets/staging-users.nix;
in {
"payments.privatestorage-staging.com" = import ../../lib/issuer.nix ({
inherit sshUsers;
--
GitLab