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 'fix-dovecot-home' into 'master'

Browse Source 
fix Dovecot's home directory

Closes #300

See merge request simple-nixos-mailserver/nixos-mailserver!345
This commit is contained in:
Christian Ulrich 2025-02-26 16:49:53 +00:00
commit 94cc3e4c9e
1 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mail-server/dovecot.nix
View File

@ -31,9 +31,14 @@ let
maildirLayoutAppendix = lib.optionalString cfg.useFsLayout ":LAYOUT=fs"; maildirLayoutAppendix = lib.optionalString cfg.useFsLayout ":LAYOUT=fs";
maildirUTF8FolderNames = lib.optionalString cfg.useUTF8FolderNames ":UTF-8"; maildirUTF8FolderNames = lib.optionalString cfg.useUTF8FolderNames ":UTF-8";
# maildir in format "/${domain}/${user}" # maildir will be at "<cfg.mailDirectory>/<domain>/<user>" (older than stateVersion 24.11) or
# "<cfg.mailDirectory>/<domain>/<user>/mail" (stateVersion 24.11 or newer)
dovecotHomeDir = if lib.versionAtLeast config.system.stateVersion "24.11"
then "${cfg.mailDirectory}/%d/%n/mail"
else "${cfg.mailDirectory}/%d/%n";
dovecotMaildir = dovecotMaildir =
"maildir:${cfg.mailDirectory}/%d/%n${maildirLayoutAppendix}${maildirUTF8FolderNames}" "maildir:${dovecotHomeDir}${maildirLayoutAppendix}${maildirUTF8FolderNames}"
+ (lib.optionalString (cfg.indexDir != null) + (lib.optionalString (cfg.indexDir != null)
":INDEX=${cfg.indexDir}/%d/%n" ":INDEX=${cfg.indexDir}/%d/%n"
); );
@ -317,7 +322,7 @@ in
userdb { userdb {
driver = passwd-file driver = passwd-file
args = ${userdbFile} args = ${userdbFile}
default_fields = uid=${builtins.toString cfg.vmailUID} gid=${builtins.toString cfg.vmailUID} home=${cfg.mailDirectory} default_fields = home=${dovecotHomeDir} uid=${toString cfg.vmailUID} gid=${toString cfg.vmailUID}
} }
${lib.optionalString cfg.ldap.enable '' ${lib.optionalString cfg.ldap.enable ''
@ -329,7 +334,7 @@ in
userdb { userdb {
driver = ldap driver = ldap
args = ${ldapConfFile} args = ${ldapConfFile}
default_fields = home=/var/vmail/ldap/%u uid=${toString cfg.vmailUID} gid=${toString cfg.vmailUID} default_fields = home=${dovecotHomeDir} uid=${toString cfg.vmailUID} gid=${toString cfg.vmailUID}
} }
''} ''}
@ -382,6 +387,30 @@ in
systemd.services.postfix.restartTriggers = [ genPasswdScript ] ++ (lib.optional cfg.ldap.enable [setPwdInLdapConfFile]); systemd.services.postfix.restartTriggers = [ genPasswdScript ] ++ (lib.optional cfg.ldap.enable [setPwdInLdapConfFile]);
systemd.services.dovecot-move-maildirs = lib.mkIf (lib.versionAtLeast config.system.stateVersion "24.11") {
description = "Move maildirs into the subdirectory 'mail'";
wantedBy = [ "dovecot2.service" ];
requisite = [ "dovecot2.service" ];
before = [ "dovecot2.service" ];
serviceConfig = {
Type = "oneshot";
User = "${cfg.vmailUserName}";
Group = "${cfg.vmailGroupName}";
ExecStart = pkgs.writeShellScript "move-maildirs" ''
set -euo pipefail
shopt -s dotglob extglob
for mailbox in $(find "${cfg.mailDirectory}" -mindepth 2 -maxdepth 2 -type d); do
if [ ! -d "$mailbox/mail" ]; then
umask 077
mkdir "$mailbox/mail"
mv "$mailbox"/!(mail) "$mailbox/mail/"
fi
done
'';
};
};
systemd.services.dovecot-fts-xapian-optimize = lib.mkIf (cfg.fullTextSearch.enable && cfg.fullTextSearch.maintenance.enable) { systemd.services.dovecot-fts-xapian-optimize = lib.mkIf (cfg.fullTextSearch.enable && cfg.fullTextSearch.maintenance.enable) {
description = "Optimize dovecot indices for fts_xapian"; description = "Optimize dovecot indices for fts_xapian";
requisite = [ "dovecot2.service" ]; requisite = [ "dovecot2.service" ];