steffen: server/kolabd/kolabd/templates imapd.conf.template.in, 1.1, 1.2 kolab_smtpdpolicy.conf.template.in, 1.1, 1.2 main.cf.template.in, 1.2, 1.3

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	imapd.conf.template.in kolab_smtpdpolicy.conf.template.in 
	main.cf.template.in 
Log Message:
new modifier syntax + changed postfix relayhost LDAP attributes

Index: imapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.conf.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- imapd.conf.template.in	13 Sep 2005 14:38:22 -0000	1.1
+++ imapd.conf.template.in	3 Oct 2005 01:07:55 -0000	1.2
@@ -42,7 +42,7 @@
 username_tolower:       1
 ##virtdomains:            userid
 
-loginrealms:		@@@postfix-mydomain@@@ @@@postfix-mydestination|join @@@
+loginrealms:		@@@postfix-mydomain@@@ @@@postfix-mydestination|join( )@@@
 
 # support for lookup of mailbox name from local LDAP server
 ldap_uri:               @@@user_ldap_uri@@@

Index: kolab_smtpdpolicy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/kolab_smtpdpolicy.conf.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab_smtpdpolicy.conf.template.in	16 Sep 2005 12:50:54 -0000	1.1
+++ kolab_smtpdpolicy.conf.template.in	3 Oct 2005 01:07:55 -0000	1.2
@@ -21,4 +21,4 @@
 @@@else@@@
 allow_unauth: 0
 @@@endif@@@
-permithosts: @@@kolabhost|join,@@@
+permithosts: @@@kolabhost|join(,)@@@

Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- main.cf.template.in	29 Sep 2005 20:03:08 -0000	1.2
+++ main.cf.template.in	3 Oct 2005 01:07:55 -0000	1.3
@@ -33,7 +33,7 @@
 myhostname = @@@fqdnhostname@@@
 mydomain = @@@postfix-mydomain@@@
 myorigin = $mydomain
-relayhost = @@@postfix-relayhost@@@
+relayhost = [@@@postfix-relayhost@@@]:@@@postfix-relayport@@@
 
 # 
 masquerade_domains = $mydomain
@@ -44,8 +44,8 @@
 #inet_interfaces = 127.0.0.1
 
 #   relaying
-mynetworks = @@@postfix-mynetworks|join @@@
-mydestination = @@@postfix-mydestination|join @@@
+mynetworks = @@@postfix-mynetworks|join( )@@@
+mydestination = @@@postfix-mydestination|join( )@@@
 relay_domains = 
 #smtpd_recipient_restrictions = permit_mynetworks, 
 #                               check_client_access hash:@emailserver_confdir@/access,