From 67b9c7ae8b8e60cd42232cc3325e2c6b0ab7d7d6 Mon Sep 17 00:00:00 2001 From: Phil Ingram Date: Fri, 11 Oct 2019 12:22:41 +1030 Subject: [PATCH 1/2] enable the use of different table formats for header_checks --- manifests/server.pp | 1 + templates/main.cf.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/server.pp b/manifests/server.pp index 9be7e4f..45b36f5 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -104,6 +104,7 @@ $smtps_smtpd_client_restrictions = 'permit_sasl_authenticated', $master_services = [], # Other files + $header_checks_type = 'regexp', $header_checks = [], $body_checks = [], # Postscreen - available in Postfix 2.8 and later diff --git a/templates/main.cf.erb b/templates/main.cf.erb index 2e0beb0..799b5fa 100644 --- a/templates/main.cf.erb +++ b/templates/main.cf.erb @@ -604,7 +604,7 @@ mailbox_command = <%= @mailbox_command %> # # For details, see "man header_checks". # -header_checks = regexp:<%= @config_directory %>/header_checks +header_checks = <%= @header_checks_type %>:<%= @config_directory %>/header_checks # FAST ETRN SERVICE # From 0522f9ec0fb19675e8aba8ebcead05058b699869 Mon Sep 17 00:00:00 2001 From: Phil Ingram Date: Fri, 11 Oct 2019 12:33:20 +1030 Subject: [PATCH 2/2] enable the use of different table formats for body_checks --- manifests/server.pp | 1 + templates/main.cf.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/server.pp b/manifests/server.pp index 45b36f5..e5ea654 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -106,6 +106,7 @@ # Other files $header_checks_type = 'regexp', $header_checks = [], + $body_checks_type = 'regexp', $body_checks = [], # Postscreen - available in Postfix 2.8 and later $postscreen = false, diff --git a/templates/main.cf.erb b/templates/main.cf.erb index 799b5fa..2bfedc9 100644 --- a/templates/main.cf.erb +++ b/templates/main.cf.erb @@ -929,7 +929,7 @@ smtpd_end_of_data_restrictions = <% end -%> <% end -%> -body_checks = regexp:<%= @config_directory %>/body_checks +body_checks = <%= @body_checks_type %>:<%= @config_directory %>/body_checks <% if @canonical_maps -%> canonical_maps = <%= @canonical_maps %>