Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable the use of different table types for header_checks and body_checks #124

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enable the use of different table types for header_checks and body_checks #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67b9c7a
enable the use of different table formats for header_checks
pingram3030 Oct 11, 2019
0522f9e
enable the use of different table formats for body_checks
pingram3030 Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions manifests/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@
$smtps_smtpd_client_restrictions = 'permit_sasl_authenticated',
$master_services = [],
# Other files
$header_checks_type = 'regexp',
$header_checks = [],
$body_checks_type = 'regexp',
$body_checks = [],
# Postscreen - available in Postfix 2.8 and later
$postscreen = false,
Expand Down
4 changes: 2 additions & 2 deletions templates/main.cf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down Expand Up @@ -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 %>
Expand Down