WIP

software/dovecot/buildout.hash.cfg

@@ -19,30 +19,30 @@ md5sum = 5ded78c210ad723606f808165fe10be6
 
 [template-default]
 _update_hash_filename_ = instance-default.cfg.in
-md5sum = 1e87d360ed90b40530a7c28e50949e0d
+md5sum = 5c478f96bfb447059f8599bca65745e3
 
 [dovecot.jinja2.conf]
 _update_hash_filename_ = dovecot.jinja2.conf
 md5sum = abfb5606d5af39b1a6682919129708d0
 [dovecot-passwd.jinja2]
 _update_hash_filename_ = dovecot-passwd.jinja2
-md5sum = 190b3130b1b60bf4ca7a58ccf1ab3e9b
+md5sum = b4f2be65faad8194fd0a1e5ccb157c8e
 
 [postfix_main.jinja2.cf]
 _update_hash_filename_ = postfix_main.jinja2.cf
-md5sum = 7f41fc15c0242bf7f9344673e068d8dc
+md5sum = 6f13224d48a8d7a3e865142ec99bd2ea
 [postfix_master.jinja2.cf]
 _update_hash_filename_ = postfix_master.jinja2.cf
 md5sum = 7752a8b4af5c18dc404e0a862af89272
 [postfix_alias.jinja2]
 _update_hash_filename_ = postfix_alias.jinja2
-md5sum = b6941dd8632208c592ba3a531df63034
+md5sum = ea0165b66d7d3da48c4977dc611c044a
 [postfix_mailname.jinja2]
 _update_hash_filename_ = postfix_mailname.jinja2
 md5sum = e7eb11cb4485b0d46f968f612643c1b0
 [postfix_vmailbox.jinja2]
 _update_hash_filename_ = postfix_vmailbox.jinja2
-md5sum = dcff25a0b3b46414cbbd88b43fa808eb
+md5sum = faa54faeb64809027f8dc38f104f28ea
 [postfix_virtual.jinja2]
 _update_hash_filename_ = postfix_virtual.jinja2
-md5sum = 0ce1aff8574a14359c4c17f02d88dec8
+md5sum = 1dd7a27d7bc43da4db1d87c44a533dea

software/dovecot/dovecot-passwd.jinja2

-ors:{PLAIN}ors123
+alpha:{PLAIN}ors123
+bravo:{PLAIN}ors123
+charlie:{PLAIN}ors123

software/dovecot/instance-default-input-schema.json

+{
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "hostname": {
+      "default": "ors.rapid.space",
+      "title": "Hostname",
+      "description": "Hostname",
+      "type": "string"
+    }
+  }
+}
+

software/dovecot/instance-default.cfg.in

@@ -120,7 +120,7 @@ extra-context =
   key log_directory directory:var-log
   key mail_owner userinfo:pw-name
   key setgid_group userinfo:gr-name
-  key ip_address ethernet-ip:ipv4
+  key ip_address slap-configuration:ipv6-random
   raw xz_utils_location {{ xz_utils_location }}
   raw postfix_location {{ postfix_location }}
 

software/dovecot/postfix_alias.jinja2

-postmaster:    ors
+postmaster:    alpha
+postmaster:    bravo
+postmaster:    charlie

software/dovecot/postfix_main.jinja2.cf

@@ -4,27 +4,28 @@ queue_directory = {{ queue_directory }}
 command_directory = {{ bin_directory }}
 daemon_directory = {{ usr_directory }}/libexec/postfix
 data_directory = {{ data_directory }}
-mail_owner = {{ mail_owner }}
-alias_maps = hash:{{ alias_file }}
-alias_database = hash:{{ alias_file }}
 mail_spool_directory = {{ spool_directory }}
-sendmail_path = {{ bin_directory }}/sendmail
-newaliases_path = {{ bin_directory }}/newaliases
-mailq_path = {{ bin_directory }}/mailq
-setgid_group = {{ setgid_group }}
 html_directory = no
 manpage_directory = {{ postfix_location }}/usr/local/man
 sample_directory = {{ postfix_location }}/etc/postfix
 readme_directory = no
+sendmail_path = {{ bin_directory }}/sendmail
+newaliases_path = {{ bin_directory }}/newaliases
+mailq_path = {{ bin_directory }}/mailq
+compatibility_level = 3.6
+smtputf8_enable = no
+
+mail_owner = {{ mail_owner }}
+setgid_group = {{ setgid_group }}
+
+alias_maps = hash:{{ alias_file }}
+alias_database = hash:{{ alias_file }}
+
 inet_interfaces = {{ ip_address }}
+inet_protocols = all
 smtp_bind_address = 0.0.0.0
 smtp_bind_address6 = ::
-compatibility_level = 3.6
-smtputf8_enable = no
 
-# Compared to default:
-# - remove X-related variables, irrelevant for slapos, to be concise
-# - add SASL_CONF_PATH to have per-partition cyrus-sasl configuration
 import_environment =
   MAIL_CONFIG MAIL_DEBUG MAIL_LOGTAG TZ LANG=C
 
@@ -33,23 +34,17 @@ smtpd_sasl_type = dovecot
 smtpd_sasl_path = private/auth
 smtpd_sasl_auth_enable = yes
 
-# Reject as many bogus cases as soon as possible, so errors are visible to ERP5
-# developper rather than relying on bounces.
 smtpd_recipient_restrictions =
   reject_non_fqdn_recipient
   reject_unknown_recipient_domain
   permit_sasl_authenticated
   reject
-# Do not allow mynetworks to send mails, only authenticated clients.
 smtpd_relay_restrictions =
   permit_sasl_authenticated
   defer_unauth_destination
 
-# We do not pass mail address in command lines, so accept those starting with
-# a dash.
 allow_min_user = yes
 
-# Disable local delivery
 local_transport = error
 
 maillog_file = {{ log_directory }}/postfix.log

software/dovecot/postfix_virtual.jinja2

-postmaster@ors.local ors@ors.local
+postmaster@ors.local alpha@ors.local
+postmaster@ors.local bravo@ors.local
+postmaster@ors.local charlie@ors.local

software/dovecot/postfix_vmailbox.jinja2

-ors@ors.local ors.local/ors
+alpha@ors.local ors.local/alpha
+bravo@ors.local ors.local/bravo
+charlie@ors.local ors.local/charlie

software/dovecot/software.cfg.json

 {
-  "name": "ERP5",
-  "description": "ERP5, Open-Source ERP",
+  "name": "Mail Server",
+  "description": "Mail Server",
   "serialisation": "json-in-xml",
   "software-type": {
     "default": {
       "title": "Default",
       "software-type": "default",
-      "request": "instance-dovecot-input-schema.json",
-      "response": "instance-dovecot-output-schema.json",
+      "request": "instance-default-input-schema.json",
+      "response": "instance-default-output-schema.json",
       "index": 0
     }
   }