gunnar: server/kolabd/kolabd/templates amavisd.conf.template.in, 1.11, 1.12

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv8610

Modified Files:
	amavisd.conf.template.in 
Log Message:
Port kolab_2_1_brach fix. New kolab.globals setting: mailfilter_addr (defaults to 127.0.0.1). cvs diff -r 1.10.2.1 -r 1.10.2.2 amavisd.conf.template.in | patch amavisd.conf.template.in

Index: amavisd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- amavisd.conf.template.in	19 Jul 2007 15:45:27 -0000	1.11
+++ amavisd.conf.template.in	6 Sep 2007 09:06:29 -0000	1.12
@@ -101,7 +101,7 @@
 # POSTFIX, or SENDMAIL in dual-MTA setup, or EXIM V4
 # (set host and port number as required; host can be specified
 # as IP address or DNS name (A or CNAME, but MX is ignored)
-$forward_method = 'smtp:127.0.0.1:10026';  # where to forward checked mail
+$forward_method = 'smtp:@@@mailfilter_addr@@@:10026';  # where to forward checked mail
 $notify_method = $forward_method;          # where to submit notifications
 
 # NOTE: The defaults (above) are good for Postfix or dual-sendmail. You MUST
@@ -237,9 +237,9 @@
 # - do not allow free access to the amavisd SMTP port !!!
 #
 # when MTA is at the same host, use the following (one or the other or both):
-#$inet_socket_bind = '127.0.0.1'; # limit socket bind to loopback interface
+$inet_socket_bind = '@@@mailfilter_addr@@@'; # limit socket bind to loopback interface
                                   # (default is '127.0.0.1')
- at inet_acl = qw( 127.0.0.1 );      # allow SMTP access only from localhost IP
+ at inet_acl = qw( @@@mailfilter_addr@@@ );      # allow SMTP access only from localhost IP
                                   # (default is qw( 127.0.0.1 ) )
 
 # when MTA (one or more) is on a different host, use the following: