Compare commits

...

4 Commits

2 changed files with 4 additions and 4 deletions

View File

@@ -203,7 +203,7 @@ with lib;
}; };
systemdTargets = mkOption { systemdTargets = mkOption {
type = with types; listOf (strMatchig "[a-zA-Z0-9@%:_.\-]+[.](service|socket|device|mount|automount|swap|target|path|timer|scope|slice)"); type = with types; listOf (strMatching "[a-zA-Z0-9@%:_.\-]+[.](service|socket|device|mount|automount|swap|target|path|timer|scope|slice)");
default = []; default = [];
example = [ "generate-mastodon-email-password.service" ]; example = [ "generate-mastodon-email-password.service" ];
description = "Systemd target which generates password file."; description = "Systemd target which generates password file.";

View File

@@ -22,9 +22,9 @@ let
_: value: { _: value: {
inherit (value) hashedPasswordFile sendOnly; inherit (value) hashedPasswordFile sendOnly;
} }
) sp.email; ) config.selfprivacy.email;
extraDomains = lib.mapAttrsToList (_: value: "${value.subdomain}.${sp.domain}") sp.email; extraDomains = lib.mapAttrsToList (_: value: "${value.subdomain}.${sp.domain}") config.selfprivacy.email;
extraTargets = lib.mapAttrsToList (_: value: value.systemdTargets) sp.email; extraTargets = lib.mapAttrsToList (_: value: value.systemdTargets) config.selfprivacy.email;
in in
lib.mkIf sp.modules.simple-nixos-mailserver.enable ( lib.mkIf sp.modules.simple-nixos-mailserver.enable (
lib.mkMerge [ lib.mkMerge [