ForkMaster/nixos-mailserver
1
0
Fork 0
mirror of https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git synced 2025-04-02 05:44:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'opendkim-settings' into 'master'

Browse Source 
WIP: Support new opendkim NixOS module

See merge request simple-nixos-mailserver/nixos-mailserver!162
This commit is contained in:
Silvan Mosberger 2025-03-21 01:40:59 +00:00
commit 4f4c9be25e
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mail-server/opendkim.nix
View File

@ -13,7 +13,7 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/> # along with this program. If not, see <http://www.gnu.org/licenses/>
{ config, lib, pkgs, ... }: { options, config, lib, pkgs, ... }:
with lib; with lib;
@ -51,11 +51,24 @@ let
dkim = config.services.opendkim; dkim = config.services.opendkim;
args = [ "-f" "-l" ] ++ lib.optionals (dkim.configFile != null) [ "-x" dkim.configFile ]; args = [ "-f" "-l" ] ++ lib.optionals (dkim.configFile != null) [ "-x" dkim.configFile ];
# Whether the opendkim changes from https://github.com/NixOS/nixpkgs/pull/82379 are present
newStyle = options.services.opendkim ? settings;
in in
{ {
config = mkIf (cfg.dkimSigning && cfg.enable) { config = mkIf (cfg.dkimSigning && cfg.enable) {
services.opendkim = { services.opendkim = {
enable = true; enable = true;
} // (if newStyle then {
settings = {
Canonicalization = "relaxed/simple";
UMask = "0002";
KeyTable = "file:${keyTable}";
SigningTable = "file:${signingTable}";
SyslogSuccess = mkIf cfg.debug true;
LogWhy = mkIf cfg.debug true;
};
} else {
selector = cfg.dkimSelector; selector = cfg.dkimSelector;
keyPath = cfg.dkimKeyDirectory; keyPath = cfg.dkimKeyDirectory;
domains = "csl:${builtins.concatStringsSep "," cfg.domains}"; domains = "csl:${builtins.concatStringsSep "," cfg.domains}";
@ -70,7 +83,7 @@ in
SyslogSuccess yes SyslogSuccess yes
LogWhy yes LogWhy yes
'')); ''));
}; });
users.users = optionalAttrs (config.services.postfix.user == "postfix") { users.users = optionalAttrs (config.services.postfix.user == "postfix") {
postfix.extraGroups = [ "${dkimGroup}" ]; postfix.extraGroups = [ "${dkimGroup}" ];
@ -78,8 +91,9 @@ in
systemd.services.opendkim = { systemd.services.opendkim = {
preStart = lib.mkForce createAllCerts; preStart = lib.mkForce createAllCerts;
serviceConfig = { serviceConfig = {
ExecStart = lib.mkForce "${pkgs.opendkim}/bin/opendkim ${escapeShellArgs args}";
PermissionsStartOnly = lib.mkForce false; PermissionsStartOnly = lib.mkForce false;
} // optionalAttrs (!newStyle) {
ExecStart = lib.mkForce "${pkgs.opendkim}/bin/opendkim ${escapeShellArgs args}";
}; };
}; };
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [