ryantm/agenix
1
1
Fork 0
mirror of https://github.com/ryantm/agenix.git synced 2024-09-11 06:05:38 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #59 from ryantm/workaround54

Browse Source 
fix: remove workaround for #54
This commit is contained in:
Ryan Mulligan 2021-09-17 09:31:09 -07:00 committed by GitHub
commit daf1d77398
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/age.nix
View File

@ -103,29 +103,21 @@ in
''; '';
}; };
}; };
config = mkIf (cfg.secrets != { }) (mkMerge [
{ config = mkIf (cfg.secrets != { }) {
assertions = [{ assertions = [{
assertion = cfg.sshKeyPaths != [ ]; assertion = cfg.sshKeyPaths != [ ];
message = "age.sshKeyPaths must be set."; message = "age.sshKeyPaths must be set.";
}]; }];
# Secrets with root owner and group can be installed before users # Secrets with root owner and group can be installed before users
# exist. This allows user password files to be encrypted. # exist. This allows user password files to be encrypted.
system.activationScripts.agenixRoot = stringAfter [ "specialfs" ] installRootOwnedSecrets; system.activationScripts.agenixRoot = stringAfter [ "specialfs" ] installRootOwnedSecrets;
system.activationScripts.users.deps = [ "agenixRoot" ]; system.activationScripts.users.deps = [ "agenixRoot" ];
# Other secrets need to wait for users and groups to exist. # Other secrets need to wait for users and groups to exist.
system.activationScripts.agenix = stringAfter [ "users" "groups" "specialfs" ] installNonRootSecrets; system.activationScripts.agenix = stringAfter [ "users" "groups" "specialfs" ] installNonRootSecrets;
} };
# workaround for #54
(optionalAttrs (builtins.hasAttr "dryActivationScript" options.system) {
system.activationScripts.users.supportsDryActivation = mkForce false;
system.activationScripts.groups.supportsDryActivation = mkForce false;
})
]);
} }