From c76af7e73d227745119daae3e741b80cab7dcd5e Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 21 Dec 2021 07:48:54 -0500
Subject: [PATCH] go with the very generic "data" suffix instead
---
DEPLOYMENT-NOTES.rst | 2 +-
morph/lib/issuer-aws.nix | 2 +-
morph/lib/issuer.nix | 2 +-
nixos/modules/issuer.nix | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/DEPLOYMENT-NOTES.rst b/DEPLOYMENT-NOTES.rst
index 2a8a5708..450971b3 100644
--- a/DEPLOYMENT-NOTES.rst
+++ b/DEPLOYMENT-NOTES.rst
@@ -19,7 +19,7 @@ Deployment notes
3. Create a labeled filesystem on the partition ::
- mkfs.ext4 -L zkapissuer-db /dev/nvme1n1p1
+ mkfs.ext4 -L zkapissuer-data /dev/nvme1n1p1
4. Deploy the PrivateStorageio update.
diff --git a/morph/lib/issuer-aws.nix b/morph/lib/issuer-aws.nix
index f9417429..8ff17280 100644
--- a/morph/lib/issuer-aws.nix
+++ b/morph/lib/issuer-aws.nix
@@ -23,7 +23,7 @@
# PaymentServer voucher database. This makes it easier to manage for
# tasks like backup/recovery and encryption.
services.private-storage-issuer.databaseFileSystem = {
- label = "zkapissuer-db";
+ label = "zkapissuer-data";
};
# Clean up packages after a while
diff --git a/morph/lib/issuer.nix b/morph/lib/issuer.nix
index 1216eb32..d3ee812e 100644
--- a/morph/lib/issuer.nix
+++ b/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."zkapissuer-db".mountPoint}/vouchers.sqlite3";
+ databasePath = "${config.fileSystems."zkapissuer-data".mountPoint}/vouchers.sqlite3";
};
}
diff --git a/nixos/modules/issuer.nix b/nixos/modules/issuer.nix
index 468170b8..67bc3c50 100644
--- a/nixos/modules/issuer.nix
+++ b/nixos/modules/issuer.nix
@@ -135,7 +135,7 @@ in {
in lib.mkIf cfg.enable {
# Make sure the voucher database filesystem is mounted.
fileSystems = {
- "zkapissuer-db" = cfg.databaseFileSystem // {
+ "zkapissuer-data" = cfg.databaseFileSystem // {
mountPoint = "/var/lib/${stateDirectory}";
};
};
--
GitLab