software/dovecot: WIP instance dovecot

software/dovecot/buildout.hash.cfg

@@ -15,15 +15,15 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = 66e1d9c9ac011bbac40770cfdc20c526
+md5sum = 35079cbfed884eadcef732ad0842bd46
 
 [template-dovecot]
 filename = instance-dovecot.cfg.in
-md5sum = 16b3ba167f55e33233a393a42ff62873
+md5sum = 76e0f278e232b0e98b22d12244779b35
 
 [template-postfix]
 filename = instance-postfix.cfg.jinja2.in
-md5sum = 23ef0d50d354bfc8f14c692b4826cb5b
+md5sum = cfea5b89b15081da3a836483e930621b
 
 [template-postfix-master-cf]
 filename = postfix_master.cf.jinja2.in

software/dovecot/instance-dovecot.cfg.in

 [buildout]
 parts =
-extends =
+  directory
+eggs-directory = {{ buildout['eggs-directory'] }}
+develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
+offline= true
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+var = $${buildout:directory}/var
+srv = $${buildout:directory}/srv
+bin = $${buildout:directory}/bin
+tmp = $${buildout:directory}/tmp
+usr = $${buildout:directory}/usr
+run = $${:etc}/run
+service = $${:etc}/service
+
+[instance-parameter]
+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}
 
-[dovecot-ssl]
-recipe = plone.recipe.command
-cert-file = $${directory:data}/cert.pem
-key-file = $${directory:data}/key.pem
-command = $${openssl:location}/bin/openssl req -newkey rsa:2048 -batch -new -x509  -days 3650 -nodes -keyout "$${:key-file}" -out "$${:cert-file}"
-update-command =
-stop-on-error = true

software/dovecot/instance-postfix.cfg.jinja2.in

@@ -32,6 +32,7 @@ recipe = slapos.cookbook:mkdirectory
 etc = $${buildout:directory}/etc
 plugin = $${:etc}/plugin
 etc-postfix = $${:etc}/postfix
+etc-dovecot = $${:etc}/dovecot
 etc-cyrus = $${:etc}/cyrus
 run = $${:etc}/run
 bin = $${buildout:directory}/bin
@@ -255,6 +256,19 @@ link-binary =
 command-line = $${directory:usr}/libexec/postfix/master
 wrapper-path = $${directory:run}/postfix-master
 
+[{{ section('service-dovecot') }}]
+recipe = slapos.cookbook:wrapper
+environment =
+  DOVE_CONFIG= $${directory:etc-dovecot}
+command-line = $${directory:usr}/dovecot
+wrapper-path = $${directory:run}/dovecot
+
+[{{ section('dovecot-symlinks-libexec') }}]
+recipe = slapos.cookbook:symbolic.link
+target-directory = $${directory:usr}
+link-binary =
+    {{ parameter_dict['dovecot-location'] }}/libexec/dovecot
+
 [monitor-instance-parameter]
 monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
 monitor-httpd-port = {{ tcpv4_port + 2 }}

software/dovecot/instance.cfg.in

@@ -6,7 +6,6 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-
 [default-dynamic-template-parameters]
 bin-directory = ${buildout:bin-directory}
 buildout-bin-directory = ${buildout:bin-directory}
@@ -16,6 +15,7 @@ buildout-bin-directory = ${buildout:bin-directory}
 cyrus-sasl-location = ${cyrus-sasl:location}
 openssl = ${openssl:location}
 postfix-location = ${postfix:location}
+dovecot-location = ${dovecot:location}
 template-postfix-aliases = ${template-postfix-aliases:target}
 template-postfix-main-cf = ${template-postfix-main-cf:target}
 template-postfix-master-cf = ${template-postfix-master-cf:target}
@@ -33,6 +33,7 @@ context =
     key slapparameter_dict slap-configuration:configuration
     key ipv6_set slap-configuration:ipv6
     raw template_monitor ${monitor2-template:output}
+    raw template_dovecot ${template-dovecot:output}
 
 [slap-configuration]
 recipe = slapos.cookbook:slapconfiguration.serialised

software/dovecot/software.cfg

@@ -8,8 +8,9 @@ extends =
 
 parts =
   slapos-cookbook
-  dovecot
   template
+  dovecot
+
 
 [dovecot]
 recipe = slapos.recipe.cmmi
@@ -26,17 +27,19 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template.cfg
 
-[download-base]
-recipe = slapos.recipe.build:download
+[template-postfix]
+recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/instance-postfix.cfg.jinja2
 
 [template-dovecot]
-<=download-base
-
-[template-postfix]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
-output = ${buildout:directory}/instance-postfix.cfg.jinja2
+output = ${buildout:directory}/instance-dovecot.cfg
+
+[download-base]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/${:filename}
 
 [template-postfix-master-cf]
 < = download-base