WIP

software/dovecot/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 4c15271f56c8ecb7efa40799684bffdb
 
 [template-default]
 _update_hash_filename_ = instance-default.cfg.in
-md5sum = c82e896ba394d038dcbfa76f5d02029c
+md5sum = fe4bbfc5495e4fa2c24737268e9ea411
 
 [dovecot.jinja2.conf]
 _update_hash_filename_ = dovecot.jinja2.conf
@@ -30,7 +30,7 @@ md5sum = e93c6661a80135b763db27e47786107c
 
 [postfix_main.jinja2.cf]
 _update_hash_filename_ = postfix_main.jinja2.cf
-md5sum = 1a778e4b71b3ee9cbcc4d4c7c442d2f5
+md5sum = 42297525b54d859aa0fd7841a162b17c
 [postfix_alias.jinja2]
 _update_hash_filename_ = postfix_alias.jinja2
 md5sum = 170fcb64781e966fa1a9718b5a925535

software/dovecot/instance-default.cfg.in

@@ -59,6 +59,7 @@ extensions = jinja2.ext.do
 extra-context =
 context =
   section directory directory
+  import  netaddr netaddr
 # section slap_configuration slap-configuration
   ${:extra-context}
 
@@ -111,7 +112,6 @@ extra-context =
   key mail_owner userinfo:pw-name
   key setgid_group userinfo:gr-name
   key ip_network ethernet-ip:ipv4
-  key ip_address slap-configuration:tun-ipv4-network
   raw postfix_location {{ postfix_location }}
 
 [postfix-alias]

software/dovecot/postfix_main.jinja2.cf

@@ -38,7 +38,7 @@ alias_database = hash:{{ alias_file }}
 myorigin = {{ mailname_file }}
 #mydestination = ors64, localhost.localdomain, localhost
 relayhost = 
-mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 {{ ip_network }}
+mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 {{ netaddr.IPNetwork(ip_address + '/24') }}
 mailbox_size_limit = 0
 recipient_delimiter = +
 inet_interfaces = {{ ip_address }}