Commit 2c3ebc5b authored by Joanne Hugé's avatar Joanne Hugé

WIP

parent 5d14f7e8
...@@ -19,7 +19,7 @@ md5sum = 06e676a14d64c2aa394bab2849aff687 ...@@ -19,7 +19,7 @@ md5sum = 06e676a14d64c2aa394bab2849aff687
[template-default] [template-default]
_update_hash_filename_ = instance-default.cfg.in _update_hash_filename_ = instance-default.cfg.in
md5sum = 5aef6eb8c5172bcedebb79e47c777284 md5sum = 21f59e513b2ab8cce8a428dd30a6fe26
[dovecot.jinja2.conf] [dovecot.jinja2.conf]
_update_hash_filename_ = dovecot.jinja2.conf _update_hash_filename_ = dovecot.jinja2.conf
......
...@@ -140,7 +140,7 @@ extra-context = ...@@ -140,7 +140,7 @@ extra-context =
key ip_address slap-configuration:ipv6-random key ip_address slap-configuration:ipv6-random
raw xz_utils_location {{ xz_utils_location }} raw xz_utils_location {{ xz_utils_location }}
raw postfix_location {{ postfix_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] [postfix-conf-master]
<= config-base <= config-base
...@@ -159,13 +159,13 @@ output = ${directory:etc-postfix}/postfix-mailname ...@@ -159,13 +159,13 @@ output = ${directory:etc-postfix}/postfix-mailname
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', 'ors.rapid.space') }} raw mail_domain {{ slapparameter_dict.get('mail_domain', 'ors.rapid.space') }}
[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', 'ors.rapid.space') }} raw mail_domain {{ slapparameter_dict.get('mail_domain', 'ors.rapid.space') }}
[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