WIP

software/mail-server/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 06e676a14d64c2aa394bab2849aff687
 
 [template-default]
 _update_hash_filename_ = instance-default.cfg.in
-md5sum = 5aef6eb8c5172bcedebb79e47c777284
+md5sum = 21f59e513b2ab8cce8a428dd30a6fe26
 
 [dovecot.jinja2.conf]
 _update_hash_filename_ = dovecot.jinja2.conf

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

@@ -140,7 +140,7 @@ extra-context =
   key ip_address slap-configuration:ipv6-random
   raw xz_utils_location {{ xz_utils_location }}
   raw postfix_location {{ postfix_location }}
-  raw mail_domain {{ slapparameter_dict.get('mail-domain', 'ors.rapid.space') }}
+  raw mail_domain {{ slapparameter_dict.get('mail_domain', 'ors.rapid.space') }}
 
 [postfix-conf-master]
 <= config-base
@@ -159,13 +159,13 @@ output = ${directory:etc-postfix}/postfix-mailname
 url = {{ postfix_vmailbox_template }}
 output = ${directory:etc-postfix}/postfix-vmailbox
 extra-context =
-  raw mail_domain {{ slapparameter_dict.get('mail-domain', 'ors.rapid.space') }}
+  raw mail_domain {{ slapparameter_dict.get('mail_domain', 'ors.rapid.space') }}
 [postfix-virtual]
 <= config-base
 url = {{ postfix_virtual_template }}
 output = ${directory:etc-postfix}/postfix-virtual
 extra-context =
-  raw mail_domain {{ slapparameter_dict.get('mail-domain', 'ors.rapid.space') }}
+  raw mail_domain {{ slapparameter_dict.get('mail_domain', 'ors.rapid.space') }}
 
 [dovecot-wrapper]
 recipe = slapos.recipe.template