Merge pull request #107 from ljohnston/master

Add postfix_smtp_generic_maps_database_type
Oefenweb · Feb 22, 2021 · fea3a8d · fea3a8d
2 parents c69a7b8 + 81f9288
commit fea3a8d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -30,6 +30,7 @@ None
  * `postfix_header_checks` [default: `[]`]: Lookup tables for content inspection of primary non-MIME message headers `/etc/postfix/header_checks` ([see](http://www.postfix.org/postconf.5.html#header_checks))
  * `postfix_header_checks_database_type` [default: `regexp`]: The database type for use in `header_checks`
  * `postfix_generic` [default: `[]`]: Generic table address mapping in `/etc/postfix/generic` ([see](http://www.postfix.org/generic.5.html))
+ * `postfix_smtp_generic_maps_database_type` [default: `"{{ postfix_default_database_type }}"`]: The database type for use in `smtp_generic_maps`
 
  * `postfix_mydestination` [default: `["{{ postfix_hostname }}", 'localdomain', 'localhost', 'localhost.localdomain']`]: Specifies what domains this machine will deliver locally, instead of forwarding to another machine
  * `postfix_mynetworks` [default: `['127.0.0.0/8', '[::ffff:127.0.0.0]/104', '[::1]/128']`]: The list of "trusted" remote SMTP clients that have more privileges than "strangers"

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -23,6 +23,7 @@ postfix_sender_dependent_relayhost_maps: []
 postfix_header_checks: []
 postfix_header_checks_database_type: regexp
 postfix_generic: []
+postfix_smtp_generic_maps_database_type: "{{ postfix_default_database_type }}"
 
 postfix_relayhost: ''
 postfix_relayhost_mxlookup: false

diff --git a/handlers/main.yml b/handlers/main.yml
@@ -29,8 +29,8 @@
   when: postfix_default_database_type != 'regexp'
 
 - name: postmap generic
-  command: postmap {{ postfix_default_database_type }}:{{ postfix_generic_file }}
-  when: postfix_default_database_type != 'regexp'
+  command: postmap {{ postfix_smtp_generic_maps_database_type }}:{{ postfix_generic_file }}
+  when: postfix_smtp_generic_maps_database_type != 'regexp'
 
 - name: remove pid
   file:

diff --git a/templates/etc/postfix/main.cf.j2 b/templates/etc/postfix/main.cf.j2
@@ -52,7 +52,7 @@ transport_maps = {{ postfix_transport_maps_database_type }}:{{ postfix_transport
 sender_dependent_relayhost_maps = {{ postfix_default_database_type }}:{{ postfix_sender_dependent_relayhost_maps_file }}
 {% endif %}
 {% if postfix_generic %}
-smtp_generic_maps = {{ postfix_default_database_type }}:{{ postfix_generic_file }}
+smtp_generic_maps = {{ postfix_smtp_generic_maps_database_type }}:{{ postfix_generic_file }}
 {% endif %}
 {% if postfix_header_checks %}
 smtp_header_checks = {{ postfix_header_checks_database_type }}:{{ postfix_header_checks_file }}