Commit d9006186 authored by Joanne Hugé's avatar Joanne Hugé

WIP

parent 11588661
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://dovecot.org/releases/2.3/dovecot-2.3.20.tar.gz url = https://dovecot.org/releases/2.3/dovecot-2.3.20.tar.gz
location = @@LOCATION@@ location = @@LOCATION@@
configure-command = ./configure configure-command = ./configure --enable-maintainer-mode
configure-options = configure-options =
--prefix=${:location} --prefix=${:location}
make-targets = install make-targets = install
......
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 86824391101f5e2131c4c06d2e7ba7f2 md5sum = 687e195329d644340e388af5c0372f58
[template-default] [template-default]
filename = instance-default.cfg.in filename = instance-default.cfg.in
md5sum = 47f942d4bf70ef430f455498963b58a7 md5sum = 7285ff357250ced114620545a226532d
[template-postfix] [template-postfix]
filename = instance-postfix.cfg.jinja2.in filename = instance-postfix.cfg.jinja2.in
...@@ -37,6 +37,6 @@ md5sum = e9f03c66627beb4054d45123450162d2 ...@@ -37,6 +37,6 @@ md5sum = e9f03c66627beb4054d45123450162d2
filename = postfix_aliases.jinja2.in filename = postfix_aliases.jinja2.in
md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0 md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
[template-dovecot-main-conf] [dovecot.jinja2.conf]
filename = dovecot_main.conf.in filename = dovecot.jinja2.conf
md5sum = 446bfa9103220c74207baad1fb7bd8d2 md5sum = 265e4d7a54ebb66811f1d8b042f8a51b
protocols = imap
listen = *, ::
base_dir = {{ directory['run'] }}
namespace inbox {
inbox = yes
location =
mailbox Drafts {
special_use = \Drafts
}
mailbox Junk {
special_use = \Junk
}
mailbox Sent {
special_use = \Sent
}
mailbox "Sent Messages" {
special_use = \Sent
}
mailbox Trash {
special_use = \Trash
}
prefix =
}
passdb {
driver = pam
}
ssl = no
userdb {
driver = passwd
}
...@@ -16,10 +16,18 @@ usr = $${buildout:directory}/usr ...@@ -16,10 +16,18 @@ usr = $${buildout:directory}/usr
run = $${:etc}/run run = $${:etc}/run
service = $${:etc}/service service = $${:etc}/service
[instance-parameter] [slap-configuration]
recipe = slapos.cookbook:slapconfiguration recipe = slapos.cookbook:slapconfiguration
computer = $${slap-connection:computer-id} computer = $${slap-connection:computer-id}
partition = $${slap-connection:partition-id} partition = $${slap-connection:partition-id}
url = $${slap-connection:server-url} url = $${slap-connection:server-url}
key = $${slap-connection:key-file} key = $${slap-connection:key-file}
cert = $${slap-connection:cert-file} cert = $${slap-connection:cert-file}
[dovecot.conf]
recipe = slapos.recipe.template:jinja2
extensions = jinja2.ext.do
url = {{ dovecot_conf_template }}
context =
section directory directory
key ipv6 slap-configuration:ipv6-random
...@@ -33,7 +33,7 @@ context = ...@@ -33,7 +33,7 @@ context =
key slapparameter_dict slap-configuration:configuration key slapparameter_dict slap-configuration:configuration
key ipv6_set slap-configuration:ipv6 key ipv6_set slap-configuration:ipv6
raw template_monitor ${monitor2-template:output} raw template_monitor ${monitor2-template:output}
raw template_dovecot ${template-dovecot:output} raw template_default ${template-default:output}
[dynamic-template-default] [dynamic-template-default]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
...@@ -44,6 +44,7 @@ extensions = jinja2.ext.do ...@@ -44,6 +44,7 @@ extensions = jinja2.ext.do
context = context =
key slapparameter_dict slap-configuration:configuration key slapparameter_dict slap-configuration:configuration
raw template_monitor ${monitor2-template:output} raw template_monitor ${monitor2-template:output}
raw dovecot_conf_template ${dovecot.jinja2.conf:target}
[slap-configuration] [slap-configuration]
recipe = slapos.cookbook:slapconfiguration.serialised recipe = slapos.cookbook:slapconfiguration.serialised
......
...@@ -40,6 +40,5 @@ url = ${:_profile_base_location_}/${:filename} ...@@ -40,6 +40,5 @@ url = ${:_profile_base_location_}/${:filename}
[template-postfix-aliases] [template-postfix-aliases]
< = download-base < = download-base
[template-dovecot-main-conf] [dovecot.jinja2.conf]
< = download-base < = download-base
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment