From f5aea632ddcaa238c2b3bab6365b7f834d8cfee6 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 4 Sep 2020 11:29:55 -0400
Subject: [PATCH] Actually pass the configured pass value along
---
morph/lib/make-storage.nix | 3 +++
morph/lib/make-testing.nix | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/morph/lib/make-storage.nix b/morph/lib/make-storage.nix
index 0c556bef..a9c968c2 100644
--- a/morph/lib/make-storage.nix
+++ b/morph/lib/make-storage.nix
@@ -3,6 +3,7 @@
, hardware # The path to the hardware configuration for this node.
, publicStoragePort # The storage port number on which to accept connections.
, ristrettoSigningKeyPath # The *local* path to the Ristretto signing key file.
+, passValue # Bytes component of size×time value of passes.
, sshUsers # Users for which to configure SSH access to this node.
, stateVersion # The value for system.stateVersion on this node.
# This value determines the NixOS release with
@@ -57,6 +58,8 @@
inherit publicStoragePort;
# Give it the Ristretto signing key, too, to support authorization.
ristrettoSigningKeyPath = deployment.secrets.ristretto-signing-key.destination;
+ # Assign the configured pass value.
+ inherit passValue;
# It gets the users, too.
inherit sshUsers;
};
diff --git a/morph/lib/make-testing.nix b/morph/lib/make-testing.nix
index df8eb006..bb254d1a 100644
--- a/morph/lib/make-testing.nix
+++ b/morph/lib/make-testing.nix
@@ -1,4 +1,4 @@
-{ publicIPv4, hardware, publicStoragePort, ristrettoSigningKeyPath, sshUsers, stateVersion, ... }: rec {
+{ publicIPv4, hardware, publicStoragePort, ristrettoSigningKeyPath, passValue, sshUsers, stateVersion, ... }: rec {
deployment = {
secrets = {
@@ -26,6 +26,7 @@
inherit publicIPv4;
inherit publicStoragePort;
ristrettoSigningKeyPath = deployment.secrets.ristretto-signing-key.destination;
+ inherit passValue;
inherit sshUsers;
};
--
GitLab