diff options
Diffstat (limited to 'configurations/manwe/mailserver/default.nix')
| -rw-r--r-- | configurations/manwe/mailserver/default.nix | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/configurations/manwe/mailserver/default.nix b/configurations/manwe/mailserver/default.nix index cc8b41d..5160604 100644 --- a/configurations/manwe/mailserver/default.nix +++ b/configurations/manwe/mailserver/default.nix @@ -4,9 +4,8 @@ lib, ... }: -with lib; { - imports = [ inputs.mailserver.nixosModule ] ++ attrValues (modulesIn ./.); + imports = [ inputs.mailserver.nixosModule ] ++ (lib.modulesIn ./. |> lib.attrValues); ark.directories = with config.mailserver; [ "/var/lib/dovecot" @@ -20,25 +19,25 @@ with lib; secrets = with config.mailserver; { dkim-key-azahi-cc = { file = "${inputs.self}/secrets/dkim-key-azahi-cc"; - path = "${dkimKeyDirectory}/${my.domain.azahi}.${dkimSelector}.key"; + path = "${dkimKeyDirectory}/${lib.my.domain.azahi}.${dkimSelector}.key"; owner = config.services.opendkim.user; inherit (config.services.opendkim) group; }; dkim-key-rohan-net = { file = "${inputs.self}/secrets/dkim-key-rohan-net"; - path = "${dkimKeyDirectory}/${my.domain.rohan}.${dkimSelector}.key"; + path = "${dkimKeyDirectory}/${lib.my.domain.rohan}.${dkimSelector}.key"; owner = config.services.opendkim.user; inherit (config.services.opendkim) group; }; dkim-key-gondor-net = { file = "${inputs.self}/secrets/dkim-key-gondor-net"; - path = "${dkimKeyDirectory}/${my.domain.gondor}.${dkimSelector}.key"; + path = "${dkimKeyDirectory}/${lib.my.domain.gondor}.${dkimSelector}.key"; owner = config.services.opendkim.user; inherit (config.services.opendkim) group; }; dkim-key-shire-net = { file = "${inputs.self}/secrets/dkim-key-shire-net"; - path = "${dkimKeyDirectory}/${my.domain.shire}.${dkimSelector}.key"; + path = "${dkimKeyDirectory}/${lib.my.domain.shire}.${dkimSelector}.key"; owner = config.services.opendkim.user; inherit (config.services.opendkim) group; }; @@ -51,7 +50,7 @@ with lib; mailserver = let - cert = config.certs.${my.domain.shire}; + cert = config.certs.${lib.my.domain.shire}; in { enable = true; @@ -65,7 +64,7 @@ with lib; enableSubmission = false; fqdn = config.networking.domain; - domains = with my.domain; [ + domains = with lib.my.domain; [ azahi gondor rohan @@ -103,11 +102,11 @@ with lib; dovecot2.sieve.extensions = [ "fileinto" ]; # https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/issues/241 - redis.servers.rspamd.enable = mkForce false; + redis.servers.rspamd.enable = lib.mkForce false; }; systemd.services.rspamd = { - requires = mkForce [ "redis-default.service" ]; - after = mkForce [ "redis-default.service" ]; + requires = lib.mkForce [ "redis-default.service" ]; + after = lib.mkForce [ "redis-default.service" ]; }; } |