yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'garage: move back to facts' (#1987) from kenji/clan-core:garage/move-to-facts into main

Browse Source
This commit is contained in:
clan-bot
2024-08-28 11:32:42 +00:00
parent b26b73350c f0281706f4
commit abda2d3754
1 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
clanModules/garage/default.nix
View File

@@ -2,9 +2,9 @@
{ {
systemd.services.garage.serviceConfig = { systemd.services.garage.serviceConfig = {
LoadCredential = [ LoadCredential = [
"rpc_secret_path:${config.clan.core.vars.generators.garage.files.rpc_secret.path}" "rpc_secret_path:${config.clan.core.facts.services.garage.secret.garage_rpc_secret.path}"
"admin_token_path:${config.clan.core.vars.generators.garage.files.admin_token.path}" "admin_token_path:${config.clan.core.facts.services.garage.secret.garage_admin_token.path}"
"metrics_token_path:${config.clan.core.vars.generators.garage.files.metrics_token.path}" "metrics_token_path:${config.clan.core.facts.services.garage.secret.garage_metrics_token.path}"
]; ];
Environment = [ Environment = [
"GARAGE_ALLOW_WORLD_READABLE_SECRETS=true" "GARAGE_ALLOW_WORLD_READABLE_SECRETS=true"
@@ -14,20 +14,37 @@
]; ];
}; };
clan.core.vars.generators.garage = { clan.core.facts.services.garage = {
files.rpc_secret = { }; secret.garage_rpc_secret = { };
files.admin_token = { }; secret.garage_admin_token = { };
files.metrics_token = { }; secret.garage_metrics_token = { };
runtimeInputs = [ generator.path = [
pkgs.coreutils pkgs.coreutils
pkgs.openssl pkgs.openssl
]; ];
script = '' generator.script = ''
openssl rand -hex -out $out/rpc_secret 32 openssl rand -hex -out $secrets/garage_rpc_secret 32
openssl rand -base64 -out $out/admin_token 32 openssl rand -base64 -out $secrets/garage_admin_token 32
openssl rand -base64 -out $out/metrics_token 32 openssl rand -base64 -out $secrets/garage_metrics_token 32
''; '';
}; };
# TODO: Vars is not in a useable state currently
# Move back, once it is implemented.
# clan.core.vars.generators.garage = {
# files.rpc_secret = { };
# files.admin_token = { };
# files.metrics_token = { };
# runtimeInputs = [
# pkgs.coreutils
# pkgs.openssl
# ];
# script = ''
# openssl rand -hex -out $out/rpc_secret 32
# openssl rand -base64 -out $out/admin_token 32
# openssl rand -base64 -out $out/metrics_token 32
# '';
# };
clan.core.state.garage.folders = [ config.services.garage.settings.metadata_dir ]; clan.core.state.garage.folders = [ config.services.garage.settings.metadata_dir ];
} }