Unverified Commit c904b9ec authored by farlerac's avatar farlerac Committed by GitHub
Browse files

more than two amavis processes (#175) 

* allow for number of amavis scanning processes to be set instead of default of 2; replace smtpd_bind_address with smtp_bind_address (typo fix)

* whoops! an integer, not a string.

* remove quotes from integer

* forgot to change parameter description of amavis_procs to integer

* save typo fix for another pr
parent 9db2a110

manifests/files.pp

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ class postfix::files { 
  include ::postfix::params



  $alias_maps          = $postfix::all_alias_maps

  $amavis_procs        = $postfix::amavis_procs

  $inet_interfaces     = $postfix::inet_interfaces

  $inet_protocols      = $postfix::inet_protocols

  $mail_user           = $postfix::mail_user

manifests/init.pp

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
#

# [*configs*]             - (hash)

#

# [*amavis_procs*]        - (integer) Number of amavis scanners to spawn

#

# [*inet_interfaces*]     - (string)

#

# [*inet_protocols*]      - (string)
@@ -93,6 +95,7 @@ 
class postfix (

  String                          $alias_maps          = 'hash:/etc/aliases',

  Optional[Hash]                  $configs             = {},

  Integer                         $amavis_procs        = 2,

  String                          $inet_interfaces     = 'all',

  String                          $inet_protocols      = 'all',

  Boolean                         $ldap                = false,

templates/master.cf.common.erb

+1 −1
Original line number Diff line number Diff line 
<% if @use_amavisd %>

amavis unix - - <%= @jail %> - 2 smtp

amavis unix - - <%= @jail %> - <%= @amavis_procs %> smtp

        -o smtp_data_done_timeout=1200

        -o smtp_send_xforward_command=yes