privatevoid.net/depot
1
1
Fork 0
Code Issues 23 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

The Simulacrum: Stage 6 #114

Merged
max merged 11 commits from pr-simulacrum-stage-6 into master 2024-08-17 01:13:16 +03:00
Conversation 0 Commits 11 Files changed 18 +7 -1
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e53f766f9d - Show all commits

8
cluster/services/storage/garage-options.nix
View file

@ -118,7 +118,7 @@ in
}; };
format = mkOption { format = mkOption {
description = "Locksmith secret format."; description = "Locksmith secret format.";
type = enum [ "files" "aws" "envFile" ]; type = enum [ "files" "aws" "envFile" "s3ql" ];
default = "files"; default = "files";
}; };
owner = mkOption { owner = mkOption {
@ -291,6 +291,12 @@ in
AWS_ACCESS_KEY_ID=@@GARAGE_KEY_ID@@ AWS_ACCESS_KEY_ID=@@GARAGE_KEY_ID@@
AWS_SECRET_ACCESS_KEY=@@GARAGE_SECRET_KEY@@ AWS_SECRET_ACCESS_KEY=@@GARAGE_SECRET_KEY@@
''; '';
s3ql = ''
[s3c]
storage-url: s3c4://
backend-login: @@GARAGE_KEY_ID@@
backend-password: @@GARAGE_SECRET_KEY@@
'';
}.${kCfg.locksmith.format}; }.${kCfg.locksmith.format};
in { in {
${key} = common // { ${key} = common // {