Merge branch 'restore-default-index-path' into 'main'
dovecot: restore default mail_index_path Closes #359 See merge request simple-nixos-mailserver/nixos-mailserver!525
This commit is contained in:
@@ -398,9 +398,7 @@ in
|
||||
fields = {
|
||||
home = "${cfg.storage.path}/%{user | domain}/%{user | username}";
|
||||
inherit (cfg.storage) uid gid;
|
||||
mail_index_path = "${
|
||||
if cfg.indexDir != null then cfg.indexDir else cfg.storage.path
|
||||
}/%{user | domain }/%{user | username}";
|
||||
mail_index_path = mkIf (cfg.indexDir != null) "${cfg.indexDir}/%{user | domain}/%{user | username}";
|
||||
};
|
||||
};
|
||||
"passdb declarative" = {
|
||||
@@ -428,9 +426,9 @@ in
|
||||
fields = {
|
||||
home = "${cfg.storage.path}/ldap/%{ldap:${cfg.ldap.attributes.uuid}}";
|
||||
inherit (cfg.storage) uid gid;
|
||||
mail_index_path = "${
|
||||
if cfg.indexDir != null then cfg.indexDir else cfg.storage.path
|
||||
}/ldap/%{ldap:${cfg.ldap.attributes.uuid}}";
|
||||
mail_index_path = mkIf (
|
||||
cfg.indexDir != null
|
||||
) "${cfg.indexDir}/ldap/%{ldap:${cfg.ldap.attributes.uuid}}";
|
||||
};
|
||||
ldap_connection_group = "ldap-userdb-conn";
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user