steffen: server/kolab/kolab/templates main.cf.template, 1.4, 1.5 master.cf.template, 1.4, 1.5

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab/kolab/templates
In directory doto:/tmp/cvs-serv30693/kolab/kolab/templates

Modified Files:
	main.cf.template master.cf.template 
Log Message:
relaying between trusted kolab smtpds works

Index: main.cf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/main.cf.template,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- main.cf.template	14 Jun 2004 11:05:18 -0000	1.4
+++ main.cf.template	16 Jun 2004 01:06:29 -0000	1.5
@@ -33,8 +33,7 @@
 #inet_interfaces = 127.0.0.1
 
 #   relaying
-mynetworks = @@@postfix-mynetworks@@@, 
-   @@@kolabhost|join,@@@
+mynetworks = @@@postfix-mynetworks@@@
 mydestination = @@@postfix-mydestination@@@
 relay_domains = 
 #smtpd_recipient_restrictions = permit_mynetworks, 
@@ -108,7 +107,7 @@
 ## Kolab Policy Server (disabled for now)
 smtpd_recipient_restrictions = permit_mynetworks,permit_sasl_authenticated,reject_unauth_destination,
 	          check_policy_service unix:private/kolabpolicy
-smtpd_sender_restrictions = check_policy_service unix:private/kolabpolicy
+smtpd_sender_restrictions = permit_mynetworks, check_policy_service unix:private/kolabpolicy
 kolabpolicy_time_limit = 3600
 
 #smtpd_recipient_restrictions = permit_mynetworks,permit_sasl_authenticated,reject_unauth_destination

Index: master.cf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/master.cf.template,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- master.cf.template	15 Jun 2004 01:52:05 -0000	1.4
+++ master.cf.template	16 Jun 2004 01:06:29 -0000	1.5
@@ -53,6 +53,7 @@
     -v -ldap @@@ldap_uri@@@ 
     -base @@@user_dn_list@@@
     -domain @@@postfix-mydomain@@@
+    -permithosts @@@kolabhost|join,@@@
 kolabgroup     unix  -       n       n       -       1       pipe user=kolab-n flags= argv=/kolab/etc/resmgr/resmgr.php 
     -r ${recipient} 
     -g