From c923b785b9ccf0313106a8107b61243110d2852e Mon Sep 17 00:00:00 2001 From: markasammut Date: Tue, 15 Nov 2016 12:09:48 +0100 Subject: [PATCH 1/3] add possibility to put a recipient access list in a file outside of main.cf --- manifests/server.pp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/manifests/server.pp b/manifests/server.pp index 94a43cf..a79570a 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -55,6 +55,7 @@ $smtpd_helo_restrictions = [], $smtpd_sender_restrictions = [], $smtpd_recipient_restrictions = [], + $smtpd_recipient_access_list = undef, $smtpd_data_restrictions = [], $smtpd_end_of_data_restrictions = [], $smtpd_delay_reject = false, @@ -194,6 +195,14 @@ require => Package[$package_name], } + if $smtpd_recipient_access_list { + file { "${config_directory}/${smtpd_recipient_access_list}" : + content => template("postfix/access_list.erb"), + notify => Service['postfix'], + require => Package[$package_name], + } + } + # Optional Spamassassin setup (using spampd) if $spamassassin { # Main packages and service they provide From bae93482ab0cca4fb76dcd78c0f709d6523540b2 Mon Sep 17 00:00:00 2001 From: markasammut Date: Tue, 15 Nov 2016 12:11:58 +0100 Subject: [PATCH 2/3] Update server.pp --- manifests/server.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/server.pp b/manifests/server.pp index a79570a..ca5e584 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -196,7 +196,7 @@ } if $smtpd_recipient_access_list { - file { "${config_directory}/${smtpd_recipient_access_list}" : + file { "${config_directory}/access_recipients" : content => template("postfix/access_list.erb"), notify => Service['postfix'], require => Package[$package_name], From a3390ce71056cd0c4b80cb607284812c792bd8c8 Mon Sep 17 00:00:00 2001 From: markasammut Date: Tue, 15 Nov 2016 12:12:43 +0100 Subject: [PATCH 3/3] template for external access_list file --- templates/access_list.erb | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 templates/access_list.erb diff --git a/templates/access_list.erb b/templates/access_list.erb new file mode 100644 index 0000000..36af498 --- /dev/null +++ b/templates/access_list.erb @@ -0,0 +1,3 @@ +<% [@smtpd_recipient_access_list].flatten.each do |recipient| -%> +<%= recipient %> OK +<% end -%>