summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2007-09-05 15:53:00 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2007-09-05 15:53:00 (GMT)
commiteecc479f8ff44677a417dd02b651372c84d03e5f (patch)
tree762bb89a07361e9049b35966c44958dd695d31da
parent52401105e9c12ebfa4e79093dc54ce1d22e5c4c1 (diff)
downloadkolab-conf-eecc479f8ff44677a417dd02b651372c84d03e5f.tar.gz
New kolab.globals setting: mailfilter_addr (defaults to 127.0.0.1)
-rw-r--r--conf/templates/amavisd.conf.template.in6
-rw-r--r--conf/templates/master.cf.template.in6
2 files changed, 6 insertions, 6 deletions
diff --git a/conf/templates/amavisd.conf.template.in b/conf/templates/amavisd.conf.template.in
index d3951a2..f62e83c 100644
--- a/conf/templates/amavisd.conf.template.in
+++ b/conf/templates/amavisd.conf.template.in
@@ -101,7 +101,7 @@ $ENV{TMPDIR} = $TEMPBASE; # wise to set TMPDIR, but not obligatory
# 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 @@ $inet_socket_port = 10024; # accept SMTP on this local TCP port
# - 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')
-@inet_acl = qw( 127.0.0.1 ); # allow SMTP access only from localhost IP
+@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:
diff --git a/conf/templates/master.cf.template.in b/conf/templates/master.cf.template.in
index 859e56c..0d6dfc4 100644
--- a/conf/templates/master.cf.template.in
+++ b/conf/templates/master.cf.template.in
@@ -53,9 +53,9 @@ smtp-amavis unix - - n - 2 smtp
-o disable_dns_lookups=yes
# SMTP interface for injecting mail back into postfix
# from kolabfilter
-127.0.0.1:10025 inet n - n - - smtpd
+@@@mailfilter_addr@@@:10025 inet n - n - - smtpd
@@@if postfix-enable-virus-scan@@@
- -o content_filter=smtp-amavis:[127.0.0.1]:10024
+ -o content_filter=smtp-amavis:[@@@mailfilter_addr@@@]:10024
@@@else@@@
-o content_filter=
@@@endif@@@
@@ -75,7 +75,7 @@ smtp-amavis unix - - n - 2 smtp
-o smtpd_hard_error_limit=1000
# SMTP interface for injecting mail back into postfix
# from amavis
-127.0.0.1:10026 inet n - n - - smtpd
+@@@mailfilter_addr@@@:10026 inet n - n - - smtpd
-o content_filter=
-o cleanup_service_name=post-cleanup
-o local_recipient_maps=