wip

software/mail-server/buildout.hash.cfg

@@ -34,9 +34,7 @@ md5sum = 9310f98c10b0264d70e80e641e8922cb
 [postfix_master.jinja2.cf]
 _update_hash_filename_ = postfix_master.jinja2.cf
 md5sum = 7752a8b4af5c18dc404e0a862af89272
-[postfix_vmailbox.jinja2]
-_update_hash_filename_ = postfix_vmailbox.jinja2
-md5sum = b01eb42fd9cecc1fcc9bad85f463eea6
-[postfix_virtual.jinja2]
-_update_hash_filename_ = postfix_virtual.jinja2
-md5sum = 701c95b5542890034444cf82ecf2a5e3
+[postfix_mysql_mailbox.jinja2.cf]
+_update_hash_filename_ = postfix_mysql_mailbox.jinja2.cf
+[postfix_mysql_aliases.jinja2.cf]
+_update_hash_filename_ = postfix_mysql_aliases.jinja2.cf

software/mail-server/mail-server-instance-default.cfg.in

@@ -129,16 +129,17 @@ extra-context =
 <= config-base
 url = {{ postfix_master_template }}
 output = ${directory:etc-postfix}/master.cf
+
 [postfix-vmailbox]
 <= config-base
 url = {{ postfix_vmailbox_template }}
-output = ${directory:etc-postfix}/postfix-vmailbox
+output = ${directory:etc-postfix}/mysql_virtual_mailbox_maps.cf
 extra-context =
   key mail_domain request-dns-entry:connection-domain
 [postfix-virtual]
 <= config-base
 url = {{ postfix_virtual_template }}
-output = ${directory:etc-postfix}/postfix-virtual
+output = ${directory:etc-postfix}/mysql_virtual_aliases.cf
 extra-context =
   key mail_domain request-dns-entry:connection-domain
 

software/mail-server/mail-server-instance.cfg.in

@@ -18,8 +18,8 @@ context =
     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_virtual_template ${postfix_virtual.jinja2:target}
-    raw postfix_vmailbox_template ${postfix_vmailbox.jinja2:target}
+    raw postfix_virtual_template ${postfix_mysql_aliases.jinja2.cf:target}
+    raw postfix_vmailbox_template ${postfix_mysql_mailbox.jinja2.cf:target}
     raw postfix_location ${postfix:location}
     raw xz_utils_location ${xz-utils:location}
     section slap_connection slap-connection

software/mail-server/software.cfg

@@ -49,9 +49,9 @@ filename = ${:_buildout_section_name_}
 < = copy-to-instance
 [postfix_master.jinja2.cf]
 < = copy-to-instance
-[postfix_vmailbox.jinja2]
+[postfix_mysql_mailbox.jinja2.cf]
 < = copy-to-instance
-[postfix_virtual.jinja2]
+[postfix_mysql_aliases.jinja2.cf]
 < = copy-to-instance
 
 [application]

stack/lamp/instance.cfg.in

@@ -44,7 +44,7 @@ context =
 recipe = slapos.cookbook:generate.password
 
 # XXX no failure if `custom_application_template` is empty
-[applica'tion-parameters]
+[application-parameters]
 custom-application-template = {{ custom_application_template }}
 custom-application-lamp-template = {{ custom_application_lamp_template }}