Commit cb365038 authored by Joanne Hugé's avatar Joanne Hugé

mail-server: use request dns entry domain instead of mail_domain parameter

parent bb44e5d5
...@@ -19,7 +19,7 @@ md5sum = 7ab3b606972e1b338d28fc1374617835 ...@@ -19,7 +19,7 @@ md5sum = 7ab3b606972e1b338d28fc1374617835
[template-default] [template-default]
_update_hash_filename_ = instance-default.cfg.in _update_hash_filename_ = instance-default.cfg.in
md5sum = 123a56ab69723d869bc52169fa5d530b md5sum = 698104b7c3694a69575c965c21629f87
[dovecot.jinja2.conf] [dovecot.jinja2.conf]
_update_hash_filename_ = dovecot.jinja2.conf _update_hash_filename_ = dovecot.jinja2.conf
......
...@@ -134,13 +134,13 @@ output = ${directory:etc-postfix}/master.cf ...@@ -134,13 +134,13 @@ output = ${directory:etc-postfix}/master.cf
url = {{ postfix_vmailbox_template }} url = {{ postfix_vmailbox_template }}
output = ${directory:etc-postfix}/postfix-vmailbox output = ${directory:etc-postfix}/postfix-vmailbox
extra-context = extra-context =
raw mail_domain {{ slapparameter_dict.get('mail_domain', '') }} key mail_domain request-dns-entry:connection-domain
[postfix-virtual] [postfix-virtual]
<= config-base <= config-base
url = {{ postfix_virtual_template }} url = {{ postfix_virtual_template }}
output = ${directory:etc-postfix}/postfix-virtual output = ${directory:etc-postfix}/postfix-virtual
extra-context = extra-context =
raw mail_domain {{ slapparameter_dict.get('mail_domain', '') }} key mail_domain request-dns-entry:connection-domain
[dovecot-wrapper] [dovecot-wrapper]
recipe = slapos.recipe.template recipe = slapos.recipe.template
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment