diff --git a/cluster/services/storage/default.nix b/cluster/services/storage/default.nix index afc8646..1a96eb9 100644 --- a/cluster/services/storage/default.nix +++ b/cluster/services/storage/default.nix @@ -95,7 +95,10 @@ in }; garage = { - keys.storage-prophet = {}; + keys.storage-prophet.locksmith = { + nodes = [ "prophet" ]; + format = "s3ql"; + }; buckets.storage-prophet = { allow.storage-prophet = [ "read" "write" ]; }; diff --git a/cluster/services/storage/external.nix b/cluster/services/storage/external.nix index 971d9a6..d1514e5 100644 --- a/cluster/services/storage/external.nix +++ b/cluster/services/storage/external.nix @@ -8,7 +8,7 @@ in services.external-storage = { fileSystems.external = { mountpoint = "/srv/storage"; - authFile = ./secrets/external-storage-auth-${hostName}.age; + locksmithSecret = "garage-storage-${hostName}"; backend = "s3c4://${cluster.config.links.garageS3.hostname}/storage-${hostName}"; backendOptions = [ "disable-expect100" ]; }; diff --git a/cluster/services/storage/secrets/external-storage-auth-prophet.age b/cluster/services/storage/secrets/external-storage-auth-prophet.age deleted file mode 100644 index bad24c8..0000000 --- a/cluster/services/storage/secrets/external-storage-auth-prophet.age +++ /dev/null @@ -1,11 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 NO562A tC8lfwNJIXjVJImBq25v/NGIQ1Ns24NpCzksbw/eb3w -2hQltUYSO2Gpjd+49IQR1UJOhy33xWvNH6dx+uGDvFA --> ssh-ed25519 5/zT0w dapxQ/VV0peQKMwghQJ91wQVahYOqxw2QrXqQCau82c -0DnIF5ISoB5htYA3X5DSTgLJXLSkqjz1O0CMcmnnrjQ --> ssh-ed25519 YIaSKQ ehv+WWCLC/co9lhpa+cAdqJUG33L/Vkn6lUXOwNRV2w -LEobbvvpq6lPNbzasGeXf9NabN150ZVe5n5OJNgbyD4 ---- FrT2CFmuWQ+vKGbBY2pGT90Mu8WzXfpbIAzYdR3Vb2w -gN 8\K!p 7k#u*{}T0|@ E>z'-RxKzBn*0~OV4q]^(>-3e0a.oC)4g7NzɔnMx6'[6w?i=vEJB -9gi"Q -ٮ \ No newline at end of file