Improve management of additional parameters

agdsn · Jul 14, 2020 · c4431fe · c4431fe
1 parent 3ae57ad
commit c4431fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -81,6 +81,7 @@ mta_config_files_all: []
 mta_config_files: []
 
 # Additional parameters
+mta_parameters_all: {}
 mta_parameters: {}
 
 # Additional services

diff --git a/templates/postfix/main.cf b/templates/postfix/main.cf
@@ -238,7 +238,7 @@ message_size_limit = {{ mta_message_size_limit }}
 unverified_recipient_reject_code = {{ mta_unverified_recipient_reject_code }}
 {% endif %}
 
-{% for key, value in mta_parameters|dictsort -%}
+{% for key, value in mta_parameters_all|combine(mta_parameters)|dictsort -%}
   {{ key }}=
   {%- if value is mapping -%}
     inline:{ {{ value | dictsort | map('join', ' = ') | map('regex_replace', '^(.*)$', '{ \\1 }') | join(', ') }} }