WIP

component/dovecot/buildout.cfg

+# Dovecot
+# https://doc.dovecot.org/
+
+[dovecot]
+recipe = slapos.recipe.cmmi
+url = https://dovecot.org/releases/2.3/dovecot-2.3.20.tar.gz
+location = @@LOCATION@@
+configure-command = ./configure
+configure-options =
+  --prefix=${:location}
+make-targets = install
+post-install = cp -r ${:location}/share/doc/dovecot/example-config/* ${:location}/etc/dovecot/

software/dovecot/buildout.hash.cfg

@@ -15,11 +15,11 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = 35079cbfed884eadcef732ad0842bd46
+md5sum = 86824391101f5e2131c4c06d2e7ba7f2
 
-[template-dovecot]
-filename = instance-dovecot.cfg.in
-md5sum = 76e0f278e232b0e98b22d12244779b35
+[template-default]
+filename = instance-default.cfg.in
+md5sum = 47f942d4bf70ef430f455498963b58a7
 
 [template-postfix]
 filename = instance-postfix.cfg.jinja2.in

software/dovecot/instance-dovecot.cfg.in → software/dovecot/instance-default.cfg.in

@@ -23,4 +23,3 @@ partition = $${slap-connection:partition-id}
 url = $${slap-connection:server-url}
 key = $${slap-connection:key-file}
 cert = $${slap-connection:cert-file}
-

software/dovecot/instance.cfg.in

@@ -35,6 +35,16 @@ context =
     raw template_monitor ${monitor2-template:output}
     raw template_dovecot ${template-dovecot:output}
 
+[dynamic-template-default]
+recipe = slapos.recipe.template:jinja2
+url = ${template-default:output}
+filename = instance-default.cfg
+output = $${buildout:directory}/$${:filename}
+extensions = jinja2.ext.do
+context =
+    key slapparameter_dict slap-configuration:configuration
+    raw template_monitor ${monitor2-template:output}
+
 [slap-configuration]
 recipe = slapos.cookbook:slapconfiguration.serialised
 computer = $${slap-connection:computer-id}
@@ -45,5 +55,5 @@ cert = $${slap-connection:cert-file}
 
 [switch-softwaretype]
 recipe = slapos.cookbook:switch-softwaretype
-default = dynamic-template-postfix:output
+default = dynamic-template-default:output
 RootSoftwareInstance = $${:default}

software/dovecot/software.cfg

@@ -2,6 +2,7 @@
 extends =
   ../../component/xz-utils/buildout.cfg
   ../../component/postfix/buildout.cfg
+  ../../component/dovecot/buildout.cfg
   ../../stack/monitor/buildout.cfg
   ../../stack/slapos.cfg
   buildout.hash.cfg
@@ -11,17 +12,6 @@ parts =
   template
   dovecot
 
-
-[dovecot]
-recipe = slapos.recipe.cmmi
-url = https://dovecot.org/releases/2.3/dovecot-2.3.20.tar.gz
-location = @@LOCATION@@
-configure-command = ./configure
-configure-options =
-  --prefix=${:location}
-make-targets = install
-post-install = cp -r ${:location}/share/doc/dovecot/example-config/* ${:location}/etc/dovecot/
-
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
@@ -32,10 +22,10 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/instance-postfix.cfg.jinja2
 
-[template-dovecot]
+[template-default]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
-output = ${buildout:directory}/instance-dovecot.cfg
+output = ${buildout:directory}/instance-default.cfg
 
 [download-base]
 recipe = slapos.recipe.build:download