diff options
Diffstat (limited to 'modules/private/mail/dovecot.nix')
-rw-r--r-- | modules/private/mail/dovecot.nix | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/modules/private/mail/dovecot.nix b/modules/private/mail/dovecot.nix index 23e795f..0ef3467 100644 --- a/modules/private/mail/dovecot.nix +++ b/modules/private/mail/dovecot.nix | |||
@@ -18,36 +18,33 @@ in | |||
18 | + /var/lib/dhparams | 18 | + /var/lib/dhparams |
19 | + /var/lib/dovecot | 19 | + /var/lib/dovecot |
20 | ''; | 20 | ''; |
21 | secrets.keys = [ | 21 | secrets.keys."dovecot/ldap" = { |
22 | { | 22 | user = config.services.dovecot2.user; |
23 | dest = "dovecot/ldap"; | 23 | group = config.services.dovecot2.group; |
24 | user = config.services.dovecot2.user; | 24 | permissions = "0400"; |
25 | group = config.services.dovecot2.group; | 25 | text = '' |
26 | permissions = "0400"; | 26 | hosts = ${config.myEnv.mail.dovecot.ldap.host} |
27 | text = '' | 27 | tls = yes |
28 | hosts = ${config.myEnv.mail.dovecot.ldap.host} | ||
29 | tls = yes | ||
30 | 28 | ||
31 | dn = ${config.myEnv.mail.dovecot.ldap.dn} | 29 | dn = ${config.myEnv.mail.dovecot.ldap.dn} |
32 | dnpass = ${config.myEnv.mail.dovecot.ldap.password} | 30 | dnpass = ${config.myEnv.mail.dovecot.ldap.password} |
33 | 31 | ||
34 | auth_bind = yes | 32 | auth_bind = yes |
35 | 33 | ||
36 | ldap_version = 3 | 34 | ldap_version = 3 |
37 | 35 | ||
38 | base = ${config.myEnv.mail.dovecot.ldap.base} | 36 | base = ${config.myEnv.mail.dovecot.ldap.base} |
39 | scope = subtree | 37 | scope = subtree |
40 | 38 | ||
41 | pass_filter = ${config.myEnv.mail.dovecot.ldap.filter} | 39 | pass_filter = ${config.myEnv.mail.dovecot.ldap.filter} |
42 | pass_attrs = ${config.myEnv.mail.dovecot.ldap.pass_attrs} | 40 | pass_attrs = ${config.myEnv.mail.dovecot.ldap.pass_attrs} |
43 | 41 | ||
44 | user_attrs = ${config.myEnv.mail.dovecot.ldap.user_attrs} | 42 | user_attrs = ${config.myEnv.mail.dovecot.ldap.user_attrs} |
45 | user_filter = ${config.myEnv.mail.dovecot.ldap.filter} | 43 | user_filter = ${config.myEnv.mail.dovecot.ldap.filter} |
46 | iterate_attrs = ${config.myEnv.mail.dovecot.ldap.iterate_attrs} | 44 | iterate_attrs = ${config.myEnv.mail.dovecot.ldap.iterate_attrs} |
47 | iterate_filter = ${config.myEnv.mail.dovecot.ldap.iterate_filter} | 45 | iterate_filter = ${config.myEnv.mail.dovecot.ldap.iterate_filter} |
48 | ''; | 46 | ''; |
49 | } | 47 | }; |
50 | ]; | ||
51 | 48 | ||
52 | users.users.vhost = { | 49 | users.users.vhost = { |
53 | group = "vhost"; | 50 | group = "vhost"; |