thomas: server/kolabd/kolabd/templates amavisd.conf.template.in, 1.10.2.2, 1.10.2.3 master.cf.template.in, 1.14.2.2, 1.14.2.3
cvs at kolab.org
cvs at kolab.org
Wed Sep 19 19:05:29 CEST 2007
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv6695/kolabd/kolabd/templates
Modified Files:
Tag: kolab_2_1_branch
amavisd.conf.template.in master.cf.template.in
Log Message:
Rename mailfilter_addr to local_addr for more generic use
Index: amavisd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template.in,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -d -r1.10.2.2 -r1.10.2.3
--- amavisd.conf.template.in 5 Sep 2007 15:53:00 -0000 1.10.2.2
+++ amavisd.conf.template.in 19 Sep 2007 17:05:27 -0000 1.10.2.3
@@ -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:@@@mailfilter_addr@@@:10026'; # where to forward checked mail
+$forward_method = 'smtp:@@@local_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 = '@@@mailfilter_addr@@@'; # limit socket bind to loopback interface
+$inet_socket_bind = '@@@local_addr@@@'; # limit socket bind to loopback interface
# (default is '127.0.0.1')
- at inet_acl = qw( @@@mailfilter_addr@@@ ); # allow SMTP access only from localhost IP
+ at inet_acl = qw( @@@local_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:
Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -d -r1.14.2.2 -r1.14.2.3
--- master.cf.template.in 5 Sep 2007 15:53:00 -0000 1.14.2.2
+++ master.cf.template.in 19 Sep 2007 17:05:27 -0000 1.14.2.3
@@ -53,9 +53,9 @@
-o disable_dns_lookups=yes
# SMTP interface for injecting mail back into postfix
# from kolabfilter
-@@@mailfilter_addr@@@:10025 inet n - n - - smtpd
+@@@local_addr@@@:10025 inet n - n - - smtpd
@@@if postfix-enable-virus-scan@@@
- -o content_filter=smtp-amavis:[@@@mailfilter_addr@@@]:10024
+ -o content_filter=smtp-amavis:[@@@local_addr@@@]:10024
@@@else@@@
-o content_filter=
@@@endif@@@
@@ -75,7 +75,7 @@
-o smtpd_hard_error_limit=1000
# SMTP interface for injecting mail back into postfix
# from amavis
-@@@mailfilter_addr@@@:10026 inet n - n - - smtpd
+@@@local_addr@@@:10026 inet n - n - - smtpd
-o content_filter=
-o cleanup_service_name=post-cleanup
-o local_recipient_maps=
More information about the commits
mailing list