Skip to content

GitLab

P
Puppet Camptocamp Postfix
Commit 6bee7abb authored by treydock's avatar treydock Committed by Raphaël Pinson
Browse files
Options

Add master_bounce_command and master_defer_command (#239)

parent dc200b05
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 16 deletions
manifests/files.pp
View file @ 6bee7abb
......@@ -12,6 +12,8 @@ class postfix::files {
$master_smtps = $postfix::master_smtps
$master_submission = $postfix::master_submission
$master_entries = $postfix::master_entries
$master_bounce_command = $postfix::master_bounce_command
$master_defer_command = $postfix::master_defer_command
$myorigin = $postfix::myorigin
$manage_root_alias = $postfix::manage_root_alias
$root_mail_recipient = $postfix::root_mail_recipient
......
manifests/init.pp
View file @ 6bee7abb
......@@ -40,6 +40,10 @@
#
# [*master_entries*] - (array of strings)
#
# [*master_bounce_command*] - (string)
#
# [*master_defer_command*] - (string)
#
# [*mta*] - (boolean) Configure postfix minimally, as a simple MTA
#
# [*mydestination*] - (string)
......@@ -96,6 +100,8 @@ class postfix (
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
String $master_bounce_command = 'bounce',
String $master_defer_command = 'bounce',
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
......
templates/master.cf.SLES11.2.erb
View file @ 6bee7abb
......@@ -30,8 +30,8 @@ qmgr fifo n - n 300 1 qmgr
#qmgr fifo n - n 300 1 oqmgr
#tlsmgr unix - - n 1000? 1 tlsmgr
rewrite unix - - <%= @jail %> - - trivial-rewrite
bounce unix - - <%= @jail %> - 0 bounce
defer unix - - <%= @jail %> - 0 bounce
bounce unix - - <%= @jail %> - 0 <%= @master_bounce_command %>
defer unix - - <%= @jail %> - 0 <%= @master_defer_command %>
trace unix - - <%= @jail %> - 0 bounce
verify unix - - <%= @jail %> - 1 verify
flush unix n - <%= @jail %> 1000? 0 flush
......
templates/master.cf.SLES11.3.erb
View file @ 6bee7abb
......@@ -30,8 +30,8 @@ qmgr fifo n - n 300 1 qmgr
#qmgr fifo n - n 300 1 oqmgr
#tlsmgr unix - - n 1000? 1 tlsmgr
rewrite unix - - <%= @jail %> - - trivial-rewrite
bounce unix - - <%= @jail %> - 0 bounce
defer unix - - <%= @jail %> - 0 bounce
bounce unix - - <%= @jail %> - 0 <%= @master_bounce_command %>
defer unix - - <%= @jail %> - 0 <%= @master_defer_command %>
trace unix - - <%= @jail %> - 0 bounce
verify unix - - <%= @jail %> - 1 verify
flush unix n - <%= @jail %> 1000? 0 flush
......
templates/master.cf.SLES11.4.erb
View file @ 6bee7abb
......@@ -29,8 +29,8 @@ qmgr fifo n - n 300 1 qmgr
#qmgr fifo n - n 300 1 oqmgr
tlsmgr unix - - <%= @jail %> 1000? 1 tlsmgr
rewrite unix - - <%= @jail %> - - trivial-rewrite
bounce unix - - <%= @jail %> - 0 bounce
defer unix - - <%= @jail %> - 0 bounce
bounce unix - - <%= @jail %> - 0 <%= @master_bounce_command %>
defer unix - - <%= @jail %> - 0 <%= @master_defer_command %>
trace unix - - <%= @jail %> - 0 bounce
verify unix - - <%= @jail %> - 1 verify
flush unix n - <%= @jail %> 1000? 0 flush
......
templates/master.cf.SLES12.2.erb
View file @ 6bee7abb
......@@ -62,8 +62,8 @@ qmgr fifo n - n 300 1 qmgr
#qmgr fifo n - n 300 1 oqmgr
#tlsmgr unix - - n 1000? 1 tlsmgr
rewrite unix - - n - - trivial-rewrite
bounce unix - - n - 0 bounce
defer unix - - n - 0 bounce
bounce unix - - n - 0 <%= @master_bounce_command %>
defer unix - - n - 0 <%= @master_defer_command %>
trace unix - - n - 0 bounce
verify unix - - n - 1 verify
flush unix n - n 1000? 0 flush
......
templates/master.cf.SLES12.3.erb
View file @ 6bee7abb
......@@ -62,8 +62,8 @@ qmgr fifo n - n 300 1 qmgr
#qmgr fifo n - n 300 1 oqmgr
#tlsmgr unix - - n 1000? 1 tlsmgr
rewrite unix - - n - - trivial-rewrite
bounce unix - - n - 0 bounce
defer unix - - n - 0 bounce
bounce unix - - n - 0 <%= @master_bounce_command %>
defer unix - - n - 0 <%= @master_defer_command %>
trace unix - - n - 0 bounce
verify unix - - n - 1 verify
flush unix n - n 1000? 0 flush
......
templates/master.cf.debian.erb
View file @ 6bee7abb
......@@ -35,8 +35,8 @@ qmgr fifo n - n 300 1 qmgr
#qmgr fifo n - n 300 1 oqmgr
tlsmgr unix - - <%= @jail %> 1000? 1 tlsmgr
rewrite unix - - <%= @jail %> - - trivial-rewrite
bounce unix - - <%= @jail %> - 0 bounce
defer unix - - <%= @jail %> - 0 bounce
bounce unix - - <%= @jail %> - 0 <%= @master_bounce_command %>
defer unix - - <%= @jail %> - 0 <%= @master_defer_command %>
trace unix - - <%= @jail %> - 0 bounce
verify unix - - <%= @jail %> - 1 verify
flush unix n - <%= @jail %> 1000? 0 flush
......
templates/master.cf.redhat.erb
View file @ 6bee7abb
......@@ -36,8 +36,8 @@ qmgr fifo n - n 300 1 qmgr
#qmgr fifo n - n 300 1 oqmgr
tlsmgr unix - - <%= @jail %> 1000? 1 tlsmgr
rewrite unix - - <%= @jail %> - - trivial-rewrite
bounce unix - - <%= @jail %> - 0 bounce
defer unix - - <%= @jail %> - 0 bounce
bounce unix - - <%= @jail %> - 0 <%= @master_bounce_command %>
defer unix - - <%= @jail %> - 0 <%= @master_defer_command %>
trace unix - - <%= @jail %> - 0 bounce
verify unix - - <%= @jail %> - 1 verify
flush unix n - <%= @jail %> 1000? 0 flush
......
templates/master.cf.sles.erb
View file @ 6bee7abb
......@@ -62,8 +62,8 @@ qmgr unix n - n 300 1 qmgr
#qmgr unix n - n 300 1 oqmgr
tlsmgr unix - - <%= @jail %> 1000? 1 tlsmgr
rewrite unix - - <%= @jail %> - - trivial-rewrite
bounce unix - - <%= @jail %> - 0 bounce
defer unix - - <%= @jail %> - 0 bounce
bounce unix - - <%= @jail %> - 0 <%= @master_bounce_command %>
defer unix - - <%= @jail %> - 0 <%= @master_defer_command %>
trace unix - - <%= @jail %> - 0 bounce
verify unix - - <%= @jail %> - 1 verify
flush unix n - <%= @jail %> 1000? 0 flush
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment