Skip to content

config(modules/secrets): Add extraKeys per host #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2025
Merged

config(modules/secrets): Add extraKeys per host #232

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions modules/secrets.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
eachServiceCfg = config.mcl.secrets.services;
isDebugVM = config.mcl.host-info.isDebugVM;

mcl-secrets = config.mcl.secrets;

sshKey =
if isDebugVM then
config.virtualisation.vmVariant.mcl.host-info.sshKey
Expand All @@ -36,6 +38,16 @@
];

options.mcl.secrets = with lib; {
extraKeys = mkOption {
type = types.listOf types.str;
default = [ ];
example = [
"ssh-ed25519 AAAAC3Nza"
"ssh-ed25519 AAAACSNss"
];
description = "Extra keys which can decrypt the secrets.";
};

services = mkOption {
type = types.attrsOf (
types.submodule (
Expand Down Expand Up @@ -84,11 +96,12 @@
default = builtins.toFile "${serviceName}-secrets.nix" ''
let
hostKey = ["${sshKey}"];
extraKeys = ["${concatStringsSep "\"\"" config.extraKeys}"];
extraKeysPerService = ["${concatStringsSep "\"\"" config.extraKeys}"];
extraKeysPerHost = ["${concatStringsSep "\"\"" mcl-secrets.extraKeys}"];
in {
${concatMapStringsSep "\n" (n: "\"${n}.age\".publicKeys = hostKey ++ extraKeys;") (
builtins.attrNames config.secrets
)}
${concatMapStringsSep "\n" (
n: "\"${n}.age\".publicKeys = hostKey ++ extraKeysPerService ++ extraKeysPerHost;"
) (builtins.attrNames config.secrets)}
}
'';
type = types.path;
Expand Down