diff --git a/README.md b/README.md index 82679bbf836c9851f41688c59816ce2ea2c3c0e3..8249131575c8a7b14664b78e8bf9fc08bcb6d31b 100644 --- a/README.md +++ b/README.md @@ -131,6 +131,11 @@ A string to define the submission line in the /etc/postfix/master.cf file. Default: Undefined. Example: 'submission inet n - n - - smtpd'. +##### `master_entries` +Array of strings containing additional entries for the /etc/postfix/master.cf file. +Default: Undefined. +Example: 'submission inet n - n - - smtpd'. + ##### `mta` A Boolean to define whether to configure Postfix as a mail transfer agent. This option is mutually exclusive with the satellite Boolean. Default: False. diff --git a/manifests/files.pp b/manifests/files.pp index d8f09ba738a139b3ea172a9647b86aae11857f11..c5c74fa8fc7e921c7fa8d5dffc129688e3e7aa86 100644 --- a/manifests/files.pp +++ b/manifests/files.pp @@ -11,6 +11,7 @@ class postfix::files { $master_smtp = $postfix::master_smtp $master_smtps = $postfix::master_smtps $master_submission = $postfix::master_submission + $master_entries = $postfix::master_entries $myorigin = $postfix::myorigin $manage_root_alias = $postfix::manage_root_alias $root_mail_recipient = $postfix::root_mail_recipient diff --git a/manifests/init.pp b/manifests/init.pp index 7f8326aa5451611e024f98eb8953ced34228de9a..ca541cdcfcbf448c6831b89bf9478f1c6f10e397 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -38,6 +38,8 @@ # # [*master_submission*] - (string) # +# [*master_entries*] - (array of strings) +# # [*mta*] - (boolean) Configure postfix minimally, as a simple MTA # # [*mydestination*] - (string) @@ -92,6 +94,7 @@ class postfix ( Optional[String] $master_smtp = undef, # postfix_master_smtp Optional[String] $master_smtps = undef, # postfix_master_smtps Optional[String] $master_submission = undef, # postfix_master_submission + Optional[Array[String]] $master_entries = undef, # postfix_master_entries Boolean $mta = false, String $mydestination = '$myorigin', # postfix_mydestination String $mynetworks = '127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128', # postfix_mynetworks diff --git a/templates/master.cf.common.erb b/templates/master.cf.common.erb index fdd6c11c762d6c3a1c9973e1c4c9d940c104a2d9..2e363bb124487c0ae5ca70e80fdb8c067138afc0 100644 --- a/templates/master.cf.common.erb +++ b/templates/master.cf.common.erb @@ -31,3 +31,6 @@ sympa unix - n n - - pipe sympabounce unix - n n - - pipe flags=R user=sympa argv=/usr/lib/sympa/bin/bouncequeue ${user} <% end -%> +<% if @master_entries %> +<%= @master_entries.join("\n") %> +<% end -%>