summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2007-10-08 15:33:12 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2007-10-08 15:33:12 (GMT)
commit20f4d089f0ddb36157181fba8c6102226e9601f3 (patch)
tree1c3fc126e2e2784ae7078cac14c0963bab4cba9a /conf
parentfc3099ac656a3ba9c45f855937b68d3358a75c0b (diff)
downloadkolab-conf-20f4d089f0ddb36157181fba8c6102226e9601f3.tar.gz
Rename mailfilter_addr to local_addr for more generic use
Diffstat (limited to 'conf')
-rw-r--r--conf/kolab.globals.in4
-rw-r--r--conf/templates/amavisd.conf.template.in6
-rw-r--r--conf/templates/master.cf.template.in6
3 files changed, 8 insertions, 8 deletions
diff --git a/conf/kolab.globals.in b/conf/kolab.globals.in
index e912a1d..075eae1 100644
--- a/conf/kolab.globals.in
+++ b/conf/kolab.globals.in
@@ -29,7 +29,6 @@ user_field_guid : entryUUID
user_field_modified : modifytimestamp
user_field_quota : cyrus-userquota
user_object_class : inetOrgPerson
-mailfilter_addr : 127.0.0.1
kolabconf_script: @kolabconf_script@
kolab_locals: @sysconfdir@/kolab/kolab.conf
kolab_usr: @kolab_usr@
@@ -46,4 +45,5 @@ KOLABRC: @KOLABRC@
ftpserver_pidfile: @ftpserver_pidfile@
sbindir: @sbindir@
webserver_logdir: @webserver_logdir@
-webserver_document_root: @webserver_document_root@ \ No newline at end of file
+webserver_document_root: @webserver_document_root@
+local_addr : 127.0.0.1
diff --git a/conf/templates/amavisd.conf.template.in b/conf/templates/amavisd.conf.template.in
index f62e83c..fe1b9d9 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:@@@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 @@ $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 = '@@@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')
-@inet_acl = qw( @@@mailfilter_addr@@@ ); # allow SMTP access only from localhost IP
+@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:
diff --git a/conf/templates/master.cf.template.in b/conf/templates/master.cf.template.in
index 6df7238..c4451d4 100644
--- a/conf/templates/master.cf.template.in
+++ b/conf/templates/master.cf.template.in
@@ -55,9 +55,9 @@ smtp-amavis unix - - n - 2 smtp
-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@@@
@@ -77,7 +77,7 @@ smtp-amavis unix - - n - 2 smtp
-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=