kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

Introduce fediversity.garage.enable

Browse source
This commit is contained in:
Nicolas Jeannerod 2025-02-14 20:10:55 +01:00
parent a5d226ed22
commit 1eeaa04df6
Signed by untrusted user: Niols
GPG key ID: 35DB9EC8886E1CB8
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
deployment/flake-part.nix
View file

@ -88,6 +88,7 @@ in
s3AccessKeyFile = pkgs.writeText "s3AccessKey" "GKb5615457d44214411e673b7b"; s3AccessKeyFile = pkgs.writeText "s3AccessKey" "GKb5615457d44214411e673b7b";
s3SecretKeyFile = pkgs.writeText "s3SecretKey" "5be6799a88ca9b9d813d1a806b64f15efa49482dbe15339ddfaf7f19cf434987"; s3SecretKeyFile = pkgs.writeText "s3SecretKey" "5be6799a88ca9b9d813d1a806b64f15efa49482dbe15339ddfaf7f19cf434987";
}; };
garage.enable = true;
}; };
} }
); );
@ -104,6 +105,7 @@ in
s3AccessKeyFile = pkgs.writeText "s3AccessKey" "GK3515373e4c851ebaad366558"; s3AccessKeyFile = pkgs.writeText "s3AccessKey" "GK3515373e4c851ebaad366558";
s3SecretKeyFile = pkgs.writeText "s3SecretKey" "7d37d093435a41f2aab8f13c19ba067d9776c90215f56614adad6ece597dbb34"; s3SecretKeyFile = pkgs.writeText "s3SecretKey" "7d37d093435a41f2aab8f13c19ba067d9776c90215f56614adad6ece597dbb34";
}; };
garage.enable = true;
temp.cores = 1; # FIXME: should come from NixOps4 eventually temp.cores = 1; # FIXME: should come from NixOps4 eventually
}; };
@ -123,6 +125,7 @@ in
s3AccessKeyFile = pkgs.writeText "s3AccessKey" "GK1f9feea9960f6f95ff404c9b"; s3AccessKeyFile = pkgs.writeText "s3AccessKey" "GK1f9feea9960f6f95ff404c9b";
s3SecretKeyFile = pkgs.writeText "s3SecretKey" "7295c4201966a02c2c3d25b5cea4a5ff782966a2415e3a196f91924631191395"; s3SecretKeyFile = pkgs.writeText "s3SecretKey" "7295c4201966a02c2c3d25b5cea4a5ff782966a2415e3a196f91924631191395";
}; };
garage.enable = true;
}; };
} }
); );

4
services/fediversity/garage/default.nix
View file

@ -16,7 +16,7 @@ in
let let
inherit (builtins) toString; inherit (builtins) toString;
inherit (lib) optionalString concatStringsSep; inherit (lib) optionalString concatStringsSep mkIf;
inherit (lib.strings) escapeShellArg; inherit (lib.strings) escapeShellArg;
inherit (lib.attrsets) filterAttrs mapAttrs'; inherit (lib.attrsets) filterAttrs mapAttrs';
concatMapAttrs = scriptFn: attrset: concatStringsSep "\n" (lib.mapAttrsToList scriptFn attrset); concatMapAttrs = scriptFn: attrset: concatStringsSep "\n" (lib.mapAttrsToList scriptFn attrset);
@ -99,7 +99,7 @@ in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config = { config = mkIf config.fediversity.garage.enable {
environment.systemPackages = [ environment.systemPackages = [
pkgs.minio-client pkgs.minio-client
pkgs.awscli pkgs.awscli

2
services/fediversity/garage/options.nix
View file

@ -6,6 +6,8 @@ in
{ {
options.fediversity.garage = { options.fediversity.garage = {
enable = mkEnableOption "Enable a Garage server on the machine";
ensureBuckets = mkOption { ensureBuckets = mkOption {
type = types.attrsOf ( type = types.attrsOf (
types.submodule { types.submodule {