WIP

software/dovecot/buildout.hash.cfg

@@ -15,11 +15,11 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = 1a7ded64d46dfddc436e18e142a973b0
+md5sum = 76fdf5d64f6575c37ef5aeeea9d6d35e
 
 [template-default]
 _update_hash_filename_ = instance-default.cfg.in
-md5sum = 621178ee449d0369e7ecb016a3933204
+md5sum = cd9b3878e40c9d72033569c6d1064331
 
 [dovecot.jinja2.conf]
 _update_hash_filename_ = dovecot.jinja2.conf
@@ -31,6 +31,9 @@ md5sum = e93c6661a80135b763db27e47786107c
 [postfix_main.jinja2.cf]
 _update_hash_filename_ = postfix_main.jinja2.cf
 md5sum = 42297525b54d859aa0fd7841a162b17c
+[postfix_master.jinja2.cf]
+_update_hash_filename_ = postfix_master.jinja2.cf
+md5sum = ef164517e3f7170d03499967d625c3bb
 [postfix_alias.jinja2]
 _update_hash_filename_ = postfix_alias.jinja2
 md5sum = 170fcb64781e966fa1a9718b5a925535

software/dovecot/instance-default.cfg.in

@@ -3,7 +3,8 @@ parts =
   directory
   dovecot-conf
   dovecot-service
-  postfix-conf
+  postfix-conf-main
+  postfix-conf-master
   postfix-service
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
@@ -99,7 +100,7 @@ init =
                   options['ipv4'] = "0.0.0.0"
 
 
-[postfix-conf]
+[postfix-conf-main]
 <= config-base
 url = {{ postfix_main_template }}
 output = ${directory:etc}/postfix_main.cf
@@ -119,6 +120,10 @@ extra-context =
   key ip_address ethernet-ip:ipv4
   raw postfix_location {{ postfix_location }}
 
+[postfix-conf-master]
+<= config-base
+url = {{ postfix_master_template }}
+output = ${directory:etc}/postfix-master
 [postfix-alias]
 <= config-base
 url = {{ postfix_alias_template }}
@@ -167,5 +172,5 @@ wrapper-path = ${directory:service}/postfix
 mode = 0775
 pidfile = ${directory:run}/postfix.pid
 hash-files =
-  ${postfix-conf:output}
+  ${postfix-conf-main:output}
   ${postfix-wrapper:output}

software/dovecot/instance.cfg.in

@@ -25,6 +25,7 @@ context =
     raw dovecot_passwd_template ${dovecot-passwd.jinja2:target}
     raw dovecot_binary ${dovecot:location}/sbin/dovecot
     raw postfix_main_template ${postfix_main.jinja2.cf:target}
+    raw postfix_master_template ${postfix_master.jinja2.cf:target}
     raw postfix_alias_template ${postfix_alias.jinja2:target}
     raw postfix_virtual_template ${postfix_virtual.jinja2:target}
     raw postfix_mailname_template ${postfix_mailname.jinja2:target}

software/dovecot/software.cfg

@@ -37,6 +37,8 @@ filename = ${:_buildout_section_name_}
 
 [postfix_main.jinja2.cf]
 < = copy-to-instance
+[postfix_master.jinja2.cf]
+< = copy-to-instance
 [postfix_alias.jinja2]
 < = copy-to-instance
 [postfix_mailname.jinja2]