diff --git a/morph/grid/production/grid.nix b/morph/grid/production/grid.nix index a65b77bd9a873c659ee9bb9f6f16aac4c2d45d6d..cf8f7eb990b4d83760a78352115de4128b7eba52 100644 --- a/morph/grid/production/grid.nix +++ b/morph/grid/production/grid.nix @@ -18,6 +18,7 @@ import ../../lib/make-grid.nix { # # The names must be unique! "payments.privatestorage.io" = import ../../lib/issuer.nix ({ + sshUsers = import ../../../../PrivateStorageSecrets/production-users.nix; hardware = ../../lib/issuer-aws.nix; stateVersion = "19.03"; } // cfg); diff --git a/morph/grid/testing/grid.nix b/morph/grid/testing/grid.nix index 4db91363105ab9f35d21ccb037427cbfb7226003..b6161f5a113dc948c9535e4a1ede40121ae5a06d 100644 --- a/morph/grid/testing/grid.nix +++ b/morph/grid/testing/grid.nix @@ -6,6 +6,7 @@ import ../../lib/make-grid.nix { config = ./config.json; nodes = cfg: { "payments.privatestorage-staging.com" = import ../../lib/issuer.nix ({ + sshUsers = import ../../../../PrivateStorageSecrets/staging-users.nix; hardware = ../../lib/issuer-aws.nix; stateVersion = "19.03"; } // cfg); diff --git a/morph/lib/issuer.nix b/morph/lib/issuer.nix index 6e1eca671b0774775cbecdeed55703c6e7b02ea1..33c87f70d81e0ad064977ab7204c5484f4d9e7e6 100644 --- a/morph/lib/issuer.nix +++ b/morph/lib/issuer.nix @@ -4,6 +4,7 @@ , issuerDomain , letsEncryptAdminEmail , allowedChargeOrigins +, sshUsers , stateVersion , ... }: { @@ -33,6 +34,7 @@ ../../nixos/modules/issuer.nix ]; + services.private-storage.sshUsers = sshUsers; services.private-storage-issuer = { enable = true; tls = true;