rename things with `voucher` in them for more clarity

The point is this is where PaymentServer's persistent state goes.  That
includes vouchers but might include more stuff too.

DEPLOYMENT-NOTES.rst

@@ -19,11 +19,11 @@ Deployment notes
 
   3. Create a labeled filesystem on the partition ::
 
-    mkfs.ext4 -L voucher-database /dev/nvme1n1p1
+    mkfs.ext4 -L zkapissuer-database /dev/nvme1n1p1
 
   4. Mount the new filesystem ::
 
-    systemctl restart var-lib-voucher-database.mount
+    systemctl restart var-lib-zkapissuer-database.mount
 
   5. Deploy the PrivateStorageio update.
 

morph/lib/hardware-vagrant.nix

@@ -37,12 +37,12 @@
     # (maybe it could?  but why bother?) we do a bind-mount here so there is a
     # configured value readable.  The database won't really have a dedicated
     # volume but it will sort of appear as if it does.
-    services.private-storage-issuer.voucherFileSystem = {
+    services.private-storage-issuer.databaseFileSystem = {
       device = "/var/lib/origin-zkapissuer-v2";
       options = ["bind"];
     };
 
-    # XXX This should be handled by the storage module like voucher-database
+    # XXX This should be handled by the storage module like zkapissuer-database
     # is handled by the issuer module.
     fileSystems."/storage" = { fsType = "tmpfs"; };
 

morph/lib/issuer-aws.nix

@@ -22,8 +22,8 @@
   # beyond control of this particular part of the system) for the
   # PaymentServer voucher database.  This makes it easier to manage for
   # tasks like backup/recovery and encryption.
-  services.private-storage-issuer.voucherFileSystem = {
-    label = "voucher-database";
+  services.private-storage-issuer.databaseFileSystem = {
+    label = "zkapissuer-database";
   };
 
   # Clean up packages after a while

morph/lib/issuer.nix

@@ -55,6 +55,6 @@ in {
     ristrettoSigningKeyPath = config.deployment.secrets.ristretto-signing-key.destination;
     stripeSecretKeyPath = config.deployment.secrets.stripe-secret-key.destination;
     database = "SQLite3";
-    databasePath = "${config.fileSystems."voucher-database".mountPoint}/vouchers.sqlite3";
+    databasePath = "${config.fileSystems."zkapissuer-database".mountPoint}/vouchers.sqlite3";
   };
 }

nixos/modules/issuer.nix

@@ -81,13 +81,13 @@ in {
         The kind of voucher database to use.
       '';
     };
-    services.private-storage-issuer.voucherFileSystem = lib.mkOption {
+    services.private-storage-issuer.databaseFileSystem = lib.mkOption {
       # Logically, the type is the type of an entry in fileSystems - but we'll
       # just let the type system enforce that when we pass the value on to
       # fileSystems.
       description = ''
-        Configuration for a filesystem to mount which will hold the voucher
-        database.
+        Configuration for a filesystem to mount which will hold the issuer's
+        internal state database.
       '';
     };
     services.private-storage-issuer.databasePath = lib.mkOption {
@@ -135,7 +135,7 @@ in {
     in lib.mkIf cfg.enable {
     # Make sure the voucher database filesystem is mounted.
     fileSystems = {
-      "voucher-database" = cfg.voucherFileSystem // {
+      "zkapissuer-database" = cfg.databaseFileSystem // {
         mountPoint = "/var/lib/${stateDirectory}";
       };
     };