cluster/services/forge: switch to locksmith secrets

This commit is contained in:
Max Headroom 2024-07-10 23:18:52 +02:00
parent c6afc266ee
commit 3a74d0b647
4 changed files with 8 additions and 14 deletions

View file

@ -1,9 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 NO562A 5NtIVE60zj6mR2+/2N0eS6lWTkddt3rsDWHZpNefLAo
5b8sLEf76HReLUuBcTVjTOnzjrVdwcxnG0TraO+eHww
-> ssh-ed25519 5/zT0w RbikYmV32iG1QgMDiObNPV+GZOW35K6hbx2n2eLCvno
bXVeCmC2UpnTx8Udpx657mMGqRvYO7Gn53YwtW6NJEk
-> ssh-ed25519 d3WGuA 4+sPg6CCmOxlJUls3qZpWvN+f2V4SHRXhrBxKQPQyho
z2TCvvpOZ8Nh4IQ0oPKD1yj0dP3rnLMzuvRpZxE2SSU
--- aj9laXQ3ccpGvhDpYIrpPzxfC4G6A5LdCkaWFSgUXUY
0žÜ¾K ÿWðúÉ=þ,nÃÑðŽ—½O{9Z±HÇN\—ûwšᇎ#•Ù´gYÊD¬PåJÿÀ

View file

@ -14,8 +14,6 @@
owner = "forgejo"; owner = "forgejo";
}; };
dbCredentials.nodes = server; dbCredentials.nodes = server;
s3AccessKeyID.nodes = server;
s3SecretAccessKey.nodes = server;
}; };
}; };
@ -24,7 +22,7 @@
in config.hostLinks.${host}.forge.url; in config.hostLinks.${host}.forge.url;
garage = { garage = {
keys.forgejo = { }; keys.forgejo.locksmith.nodes = config.services.forge.nodes.server;
buckets.forgejo.allow.forgejo = [ "read" "write" ]; buckets.forgejo.allow.forgejo = [ "read" "write" ];
}; };
} }

View file

@ -23,6 +23,11 @@ in
]; ];
}; };
services.locksmith.waitForSecrets.forgejo = [
"garage-forgejo-id"
"garage-forgejo-secret"
];
services.forgejo = { services.forgejo = {
enable = true; enable = true;
package = depot.packages.forgejo; package = depot.packages.forgejo;
@ -73,8 +78,8 @@ in
}; };
secrets = { secrets = {
storage = { storage = {
MINIO_ACCESS_KEY_ID = secrets.s3AccessKeyID.path; MINIO_ACCESS_KEY_ID = "/run/locksmith/garage-forgejo-id";
MINIO_SECRET_ACCESS_KEY = secrets.s3SecretAccessKey.path; MINIO_SECRET_ACCESS_KEY = "/run/locksmith/garage-forgejo-secret";
}; };
}; };
}; };