diff --git a/nixos/modules/private-storage.nix b/nixos/modules/private-storage.nix index 3a716cf05eeb8a5bd5b2aafb6f6c2b3aa54da894..1b55614859801fd7580dd50508a10382bb493ae3 100644 --- a/nixos/modules/private-storage.nix +++ b/nixos/modules/private-storage.nix @@ -132,9 +132,9 @@ in # Put the storage where we have a lot of space configured. storage_dir = "/storage"; # Turn on our plugin. - plugins = "privatestorageio-zkapauthz-v1"; + plugins = "privatestorageio-zkapauthz-v2"; }; - "storageserver.plugins.privatestorageio-zkapauthz-v1" = + "storageserver.plugins.privatestorageio-zkapauthz-v2" = { "ristretto-issuer-root-url" = cfg.issuerRootURL; "ristretto-signing-key-path" = cfg.ristrettoSigningKeyPath; } // ( diff --git a/nixos/tests/get-passes.py b/nixos/tests/get-passes.py index 206e8900e496f7b08967fb11715043fedeaa3f5d..6f9263345521fa9e3977015231a06060f83bd912 100755 --- a/nixos/tests/get-passes.py +++ b/nixos/tests/get-passes.py @@ -29,7 +29,7 @@ def main(): if issuerAPIRoot is not None and not issuerAPIRoot.endswith("/"): issuerAPIRoot += "/" - zkapauthz = clientAPIRoot + "storage-plugins/privatestorageio-zkapauthz-v1" + zkapauthz = clientAPIRoot + "storage-plugins/privatestorageio-zkapauthz-v2" with open(clientAPITokenPath) as p: clientAPIToken = p.read().strip() diff --git a/nixos/tests/run-client.py b/nixos/tests/run-client.py index 8d3d82720ec94b4b91e6af8791aadc58cd7ce2ad..86909bde894225865c9f295f4ba3c461519141a4 100755 --- a/nixos/tests/run-client.py +++ b/nixos/tests/run-client.py @@ -29,12 +29,12 @@ def main(): with open("/tmp/client/tahoe.cfg") as cfg: config.read_file(cfg) - config.set(u"client", u"storage.plugins", u"privatestorageio-zkapauthz-v1") - config.add_section(u"storageclient.plugins.privatestorageio-zkapauthz-v1") - config.set(u"storageclient.plugins.privatestorageio-zkapauthz-v1", u"redeemer", u"ristretto") - config.set(u"storageclient.plugins.privatestorageio-zkapauthz-v1", u"ristretto-issuer-root-url", issuerURL) - config.set(u"storageclient.plugins.privatestorageio-zkapauthz-v1", u"allowed-public-keys", publicKey) - config.set(u"storageclient.plugins.privatestorageio-zkapauthz-v1", u"default-token-count", tokenCount) + config.set(u"client", u"storage.plugins", u"privatestorageio-zkapauthz-v2") + config.add_section(u"storageclient.plugins.privatestorageio-zkapauthz-v2") + config.set(u"storageclient.plugins.privatestorageio-zkapauthz-v2", u"redeemer", u"ristretto") + config.set(u"storageclient.plugins.privatestorageio-zkapauthz-v2", u"ristretto-issuer-root-url", issuerURL) + config.set(u"storageclient.plugins.privatestorageio-zkapauthz-v2", u"allowed-public-keys", publicKey) + config.set(u"storageclient.plugins.privatestorageio-zkapauthz-v2", u"default-token-count", tokenCount) with open("/tmp/client/tahoe.cfg", "wt") as cfg: config.write(cfg) diff --git a/nixos/tests/test_privatestorage.py b/nixos/tests/test_privatestorage.py index 0429ac9257f7b587f4efd1d1ecc53375ed9ee4d3..724b99c3667074bc97af13ebe5de71dd58405f24 100644 --- a/nixos/tests/test_privatestorage.py +++ b/nixos/tests/test_privatestorage.py @@ -274,7 +274,7 @@ def test( # It should be possible to restart the storage service without the # storage node fURL changing. - furlfile = '/var/db/tahoe-lafs/storage/private/storage-plugin.privatestorageio-zkapauthz-v1.furl' + furlfile = '/var/db/tahoe-lafs/storage/private/storage-plugin.privatestorageio-zkapauthz-v2.furl' before = storage.execute('cat ' + furlfile) runOnNode(storage, [["systemctl", "restart", "tahoe.storage"]]) after = storage.execute('cat ' + furlfile)