WIP

software/dovecot/buildout.hash.cfg

@@ -19,18 +19,18 @@ md5sum = 5ded78c210ad723606f808165fe10be6
 
 [template-default]
 _update_hash_filename_ = instance-default.cfg.in
-md5sum = 95ff8556175b62923e47b05c5407e73c
+md5sum = ec7f74baca8268d169e77447fa0f93b0
 
 [dovecot.jinja2.conf]
 _update_hash_filename_ = dovecot.jinja2.conf
-md5sum = 7ad3f4f04ab397786ac07ca0fb98ca85
+md5sum = abfb5606d5af39b1a6682919129708d0
 [dovecot-passwd.jinja2]
 _update_hash_filename_ = dovecot-passwd.jinja2
-md5sum = e93c6661a80135b763db27e47786107c
+md5sum = 190b3130b1b60bf4ca7a58ccf1ab3e9b
 
 [postfix_main.jinja2.cf]
 _update_hash_filename_ = postfix_main.jinja2.cf
-md5sum = 1f074370dd23df1cb6c4600df353df3e
+md5sum = f0074c518821be72d4d331aa558e254e
 [postfix_master.jinja2.cf]
 _update_hash_filename_ = postfix_master.jinja2.cf
 md5sum = 7752a8b4af5c18dc404e0a862af89272
@@ -39,10 +39,10 @@ _update_hash_filename_ = postfix_alias.jinja2
 md5sum = 170fcb64781e966fa1a9718b5a925535
 [postfix_mailname.jinja2]
 _update_hash_filename_ = postfix_mailname.jinja2
-md5sum = b52d8233637368f488a1287ef28db1b1
+md5sum = e7eb11cb4485b0d46f968f612643c1b0
 [postfix_vmailbox.jinja2]
 _update_hash_filename_ = postfix_vmailbox.jinja2
-md5sum = 2b9cac9517f2a5504d6dafde1844ebbc
+md5sum = 8c720937c1cbf74371ee41c5e5577369
 [postfix_virtual.jinja2]
 _update_hash_filename_ = postfix_virtual.jinja2
-md5sum = 281440a544e5a2ca142c97336e1cd71c
+md5sum = 5b51b6cb273f8aeedf49f7d46c19f0dd

software/dovecot/dovecot-passwd.jinja2

-doveuser:{PLAIN}0WOu(yLok)u.w6&2
+ors:{PLAIN}ors123

software/dovecot/dovecot.jinja2.conf

@@ -83,6 +83,6 @@ passdb {
   driver = passwd-file
 }
 userdb {
-  driver = passwd
-  args = uid={{ slap_configuration['user-name'] }} gid={{ slap_configuration['user-name'] }} home=/home/%u
+  driver = static
+  args = uid={{ slap_configuration['user-name'] }} gid={{ slap_configuration['user-name'] }} home={{ directory['home-dovecot'] }}/%u
 }

software/dovecot/instance-default.cfg.in

@@ -16,7 +16,6 @@ recipe = slapos.cookbook:mkdirectory
 home = ${buildout:directory}
 etc = ${:home}/etc
 var = ${:home}/var
-etc = ${:home}/etc
 bin = ${:home}/bin
 usr = ${:home}/usr
 tmp = ${:home}/tmp
@@ -26,6 +25,7 @@ run-dovecot = ${:run}/dovecot
 var-dovecot = ${:var}/dovecot
 tmp-dovecot = ${:tmp}/dovecot
 libexec-dovecot = ${:libexec}/dovecot
+home-dovecot = ${:home}/dovecot-home
 script = ${:etc}/run
 service = ${:etc}/service
 promise = ${:etc}/promise
@@ -106,14 +106,14 @@ init =
 [postfix-conf-main]
 <= config-base
 url = {{ postfix_main_template }}
-output = ${directory:etc}/main.cf
+output = ${directory:etc-postfix}/main.cf
 extra-context =
   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 usr_directory directory:usr-postfix
   key queue_directory directory:var-spool-postfix
   key data_directory directory:var-lib-postfix
   key spool_directory directory:var-spool
@@ -128,23 +128,23 @@ extra-context =
 [postfix-conf-master]
 <= config-base
 url = {{ postfix_master_template }}
-output = ${directory:etc}/master.cf
+output = ${directory:etc-postfix}/master.cf
 [postfix-alias]
 <= config-base
 url = {{ postfix_alias_template }}
-output = ${directory:etc}/postfix-alias
+output = ${directory:etc-postfix}/postfix-alias
 [postfix-mailname]
 <= config-base
 url = {{ postfix_mailname_template }}
-output = ${directory:etc}/postfix-mailname
+output = ${directory:etc-postfix}/postfix-mailname
 [postfix-vmailbox]
 <= config-base
 url = {{ postfix_vmailbox_template }}
-output = ${directory:etc}/postfix-vmailbox
+output = ${directory:etc-postfix}/postfix-vmailbox
 [postfix-virtual]
 <= config-base
 url = {{ postfix_virtual_template }}
-output = ${directory:etc}/postfix-virtual
+output = ${directory:etc-postfix}/postfix-virtual
 
 [dovecot-wrapper]
 recipe = slapos.recipe.template
@@ -174,7 +174,7 @@ recipe = slapos.recipe.template
 output = ${directory:bin}/${:_buildout_section_name_}
 inline =
   #!/bin/sh
-  ${directory:usr-postfix}/libexec/postfix/master
+  ${directory:usr-postfix}/libexec/postfix/master -d -v -w -c ${directory:etc-postfix}
 
 [postfix-service]
 recipe = slapos.cookbook:wrapper

software/dovecot/postfix_aliases.jinja2.in

-# See http://www.postfix.org/aliases.5.html for format
-{% for name, alias_list in alias_dict.items() -%}
-{{ name }}: {{ alias_list | join(', ') }}
-{% endfor %}

software/dovecot/postfix_mailname.jinja2

-mydomain.local
+ors.local

software/dovecot/postfix_main.jinja2.cf

@@ -22,8 +22,6 @@ import_environment =
   SASL_CONF_PATH
 
 allow_min_user = yes
-maillog_file_compressor = {{ xz_utils_location }}/bin/xz
-maillog_file_prefixes = {{ log_directory }}
 
 biff = no
 
@@ -72,4 +70,5 @@ virtual_alias_maps = hash:{{ virtual_file }}
 virtual_transport = lmtp:unix:private/dovecot-lmtp
 
 maillog_file = {{ directory['log'] }}/postfix.log
-
+maillog_file_compressor = {{ xz_utils_location }}/bin/xz
+maillog_file_prefixes = {{ log_directory }}

software/dovecot/postfix_virtual.jinja2

-postmaster@mydomain.local test1@mydomain.local
-hostmaster@mydomain.local test2@mydomain.local
+postmaster@ors.local slapuser15@ors.local

software/dovecot/postfix_vmailbox.jinja2

-test1@mydomain.local mydomain.local/test1
-test2@mydomain.local mydomain.local/test2
+slapuser15@ors.local ors.local/slapuser15