dovecot: running

software/dovecot/buildout.hash.cfg

@@ -19,11 +19,11 @@ md5sum = 1a7ded64d46dfddc436e18e142a973b0
 
 [template-default]
 _update_hash_filename_ = instance-default.cfg.in
-md5sum = 3aa48d86c8fc8f132e37e6cd68336525
+md5sum = 621178ee449d0369e7ecb016a3933204
 
 [dovecot.jinja2.conf]
 _update_hash_filename_ = dovecot.jinja2.conf
-md5sum = 7d0a3af0e3be0344de1e1bd478f0564a
+md5sum = 7ad3f4f04ab397786ac07ca0fb98ca85
 [dovecot-passwd.jinja2]
 _update_hash_filename_ = dovecot-passwd.jinja2
 md5sum = e93c6661a80135b763db27e47786107c

software/dovecot/dovecot.jinja2.conf

@@ -3,11 +3,13 @@ auth_debug = yes
 auth_mechanisms = plain login
 auth_username_format = %n
 auth_verbose = yes
-base_dir = {{ directory['run'] }}
+base_dir = {{ directory['run-dovecot'] }}
+state_dir = {{directory['var-dovecot'] }}
+mail_temp_dir = {{directory['tmp-dovecot'] }}
 
-default_internal_user = {{ slap_configuration.['user-name'] }}
-default_login_user = {{ slap_configuration.['user-name'] }}
-default_internal_group = {{ slap_configuration.['user-name'] }}
+default_internal_user = {{ slap_configuration['user-name'] }}
+default_login_user = {{ slap_configuration['user-name'] }}
+default_internal_group = {{ slap_configuration['user-name'] }}
 
 disable_plaintext_auth = no
 mail_location = maildir:~/Maildir
@@ -21,6 +23,12 @@ service imap-login {
 }
 service pop3-login {
   chroot =
+  inet_listener pop3 {
+    port = 10110
+  }
+  inet_listener pop3s {
+    port = 10995
+  }
 }
 service imap-login {
   inet_listener imap {
@@ -33,16 +41,15 @@ service imap-login {
 service auth {
   unix_listener {{ postfix_auth }} {
     mode = 0660
-    # Assuming the default Postfix user and group
-    user = postfix
-    group = postfix
+    user = {{ slap_configuration['user-name'] }}
+    group = {{ slap_configuration['user-name'] }}
   }
 }
 service lmtp {
   unix_listener {{ postfix_dovecot_lmtp }} {
-    group = postfix
+    user = {{ slap_configuration['user-name'] }}
+    group = {{ slap_configuration['user-name'] }}
     mode = 0600
-    user = postfix
   }
 }
 log_path = {{ directory['log'] }}/dovecot.log
@@ -77,5 +84,5 @@ passdb {
 }
 userdb {
   driver = passwd
-  args = uid={{ slap_configuration.['user-name'] }} gid={{ slap_configuration.['user-name'] }} home=/home/%u
+  args = uid={{ slap_configuration['user-name'] }} gid={{ slap_configuration['user-name'] }} home=/home/%u
 }

software/dovecot/instance-default.cfg.in

@@ -19,6 +19,11 @@ bin = ${:home}/bin
 usr = ${:home}/usr
 tmp = ${:home}/tmp
 run = ${:var}/run
+libexec = ${:usr}/libexec
+run-dovecot = ${:run}/dovecot
+var-dovecot = ${:var}/dovecot
+tmp-dovecot = ${:tmp}/dovecot
+libexec-dovecot = ${:libexec}/dovecot
 script = ${:etc}/run
 service = ${:etc}/service
 promise = ${:etc}/promise
@@ -99,10 +104,10 @@ init =
 url = {{ postfix_main_template }}
 output = ${directory:etc}/postfix_main.cf
 extra-context =
-  key postfix_alias postfix-alias:output
-  key postfix_mailname postfix-mailname:output
-  key postfix_vmailbox postfix-vmailbox:output
-  key postfix_virtual postfix-virtual:output
+  key alias_file postfix-alias:output
+  key mailname_file postfix-mailname:output
+  key vmailbox_file postfix-vmailbox:output
+  key virtual_file postfix-virtual:output
   key bin_directory directory:bin
   key usr_directory directory:usr
   key queue_directory directory:var-spool-postfix
@@ -111,7 +116,7 @@ extra-context =
   key vhosts_directory directory:vhosts
   key mail_owner userinfo:pw-name
   key setgid_group userinfo:gr-name
-  key ip_network ethernet-ip:ipv4
+  key ip_address ethernet-ip:ipv4
   raw postfix_location {{ postfix_location }}
 
 [postfix-alias]
@@ -136,7 +141,7 @@ recipe = slapos.recipe.template
 output = ${directory:bin}/${:_buildout_section_name_}
 inline =
   #!/bin/sh
-  {{ dovecot_binary }} -c ${dovecot-conf:output}
+  {{ dovecot_binary }} -F -c ${dovecot-conf:output}
 
 [dovecot-service]
 recipe = slapos.cookbook:wrapper