WIP

software/dovecot/buildout.hash.cfg

@@ -15,11 +15,11 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = 4c15271f56c8ecb7efa40799684bffdb
+md5sum = 1a7ded64d46dfddc436e18e142a973b0
 
 [template-default]
 _update_hash_filename_ = instance-default.cfg.in
-md5sum = d9db558c6874fb0e6dbba3f76221053a
+md5sum = 510680877b87c2a474c04b835b6d3f0e
 
 [dovecot.jinja2.conf]
 _update_hash_filename_ = dovecot.jinja2.conf

software/dovecot/instance-default.cfg.in

@@ -46,12 +46,12 @@ var-spool-postfix-saved = ${:var-spool-postfix}/saved
 var-spool-postfix-trace = ${:var-spool-postfix}/trace
 
 [slap-configuration]
-recipe = slapos.cookbook:slapconfiguration
-computer = $${slap-connection:computer-id}
-partition = $${slap-connection:partition-id}
-url = $${slap-connection:server-url}
-key = $${slap-connection:key-file}
-cert = $${slap-connection:cert-file}
+recipe = slapos.cookbook:slapconfiguration.serialised
+computer = {{ slap_connection['computer-id'] }}
+partition = {{ slap_connection['partition-id'] }}
+url = {{ slap_connection['server-url'] }}
+key = {{ slap_connection['key-file'] }}
+cert = {{ slap_connection['cert-file'] }}
 
 [config-base]
 recipe = slapos.recipe.template:jinja2

software/dovecot/instance.cfg.in

@@ -31,6 +31,7 @@ context =
     raw postfix_vmailbox_template ${postfix_vmailbox.jinja2:target}
     raw postfix_binary ${postfix:location}/usr/libexec/sbin/master
     raw postfix_location ${postfix:location}
+    section slap_connection slap-connection
 
 [slap-configuration]
 recipe = slapos.cookbook:slapconfiguration.serialised