aither/simple-nixos-mailserver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'restore-default-index-path' into 'main'

Browse Source 
dovecot: restore default mail_index_path

Closes #359

See merge request simple-nixos-mailserver/nixos-mailserver!525
This commit is contained in:
Martin Weinelt
2026-05-24 02:12:13 +00:00
parent e4e18e01de 4dcd114a2f
commit 58ff4da02f
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail-server/dovecot.nix
+4 -6
View File
@@ -398,9 +398,7 @@ in
fields = { fields = {
home = "${cfg.storage.path}/%{user | domain}/%{user | username}"; home = "${cfg.storage.path}/%{user | domain}/%{user | username}";
inherit (cfg.storage) uid gid; inherit (cfg.storage) uid gid;
mail_index_path = "${ mail_index_path = mkIf (cfg.indexDir != null) "${cfg.indexDir}/%{user | domain}/%{user | username}";
if cfg.indexDir != null then cfg.indexDir else cfg.storage.path
}/%{user | domain }/%{user | username}";
}; };
}; };
"passdb declarative" = { "passdb declarative" = {
@@ -428,9 +426,9 @@ in
fields = { fields = {
home = "${cfg.storage.path}/ldap/%{ldap:${cfg.ldap.attributes.uuid}}"; home = "${cfg.storage.path}/ldap/%{ldap:${cfg.ldap.attributes.uuid}}";
inherit (cfg.storage) uid gid; inherit (cfg.storage) uid gid;
mail_index_path = "${ mail_index_path = mkIf (
if cfg.indexDir != null then cfg.indexDir else cfg.storage.path cfg.indexDir != null
}/ldap/%{ldap:${cfg.ldap.attributes.uuid}}"; ) "${cfg.indexDir}/ldap/%{ldap:${cfg.ldap.attributes.uuid}}";
}; };
ldap_connection_group = "ldap-userdb-conn"; ldap_connection_group = "ldap-userdb-conn";
}; };