Merge branch 'develop' into local-dev-env-3

morph/grid/production/grid.nix

@@ -20,7 +20,7 @@ import ../../lib/make-grid.nix {
     # doesn't specify one.
     #
     # The names must be unique!
-    "payments.privatestorage.io" = import ../../lib/issuer.nix ({
+    "payments.privatestorage.io" = import ../../lib/make-issuer.nix ({
       publicIPv4 = "18.184.142.208";
       inherit sshUsers;
       hardware = ../../lib/issuer-aws.nix;

morph/grid/testing/grid.nix

@@ -13,7 +13,7 @@ import ../../lib/make-grid.nix {
     );
     sshUsers = importDef {} ../../../../PrivateStorageSecrets/staging-users.nix;
   in {
-    "payments" = import ../../lib/issuer.nix ({
+    "payments" = import ../../lib/make-issuer.nix ({
       publicIPv4 = "18.197.42.120";
       inherit sshUsers;
       hardware = ../../lib/issuer-aws.nix;