gunnar: server/kolabd/kolabd/templates master.cf.template.in, 1.21, 1.22 resmgr.conf.template.in, 1.25, 1.26

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	master.cf.template.in resmgr.conf.template.in 
Log Message:
Updated the configuration for the newer Kolab_Filter package.

Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- master.cf.template.in	3 Jul 2008 12:11:45 -0000	1.21
+++ master.cf.template.in	19 Sep 2008 14:06:59 -0000	1.22
@@ -100,9 +100,10 @@
     --
     -h @@@fqdnhostname@@@
     -s ${sender}
-    -r ${recipient}
+    --recipient=${recipient}
     -c ${client_address}
     -u ${sasl_username}
+    -C @resmgr_confdir@/kolabfilter.conf
 
 kolabmailboxfilter     unix  -       n       n       -       -       pipe user=@emailserver_master_usr@ null_sender= argv=@PHP@
     -c @phpini_dir@/php.ini
@@ -110,6 +111,7 @@
     --
     -h @@@fqdnhostname@@@
     -s ${sender}
-    -r ${recipient}
+    --recipient=${recipient}
     -c ${client_address}
+    -C @resmgr_confdir@/kolabfilter.conf
 

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- resmgr.conf.template.in	4 Aug 2008 16:37:12 -0000	1.25
+++ resmgr.conf.template.in	19 Sep 2008 14:06:59 -0000	1.26
@@ -1,5 +1,5 @@
 KOLAB_META_START
-TARGET=@resmgr_confdir@/config.php
+TARGET=@resmgr_confdir@/kolabfilter.conf
 PERMISSIONS=0640
 OWNERSHIP=@resmgr_conffile_usr@:@resmgr_conffile_grp@
 KOLAB_META_END
@@ -38,6 +38,7 @@
  *  kolabfilter.php and the kolabmailboxfilter.php scripts.
  *
  */
+global $conf;
 
 $conf = array();
 
@@ -126,16 +127,16 @@
 /* What is the address of the LDAP server address where user objects
  * reside
  */
-$conf['filter']['ldap_uri'] = '@@@ldap_uri@@@';
+$conf['kolab']['ldap']['server'] = '@@@ldap_uri@@@';
 
 /* What is the Base DN of our LDAP database? */
-$conf['filter']['base_dn'] = '@@@base_dn@@@';
+$conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
 
 /* What DN should we use to bind to the LDAP server? */
-$conf['filter']['bind_dn'] = '@@@php_dn@@@';
+$conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
 
 /* What password should we use with the above DN when binding? */
-$conf['filter']['bind_pw'] = '@@@php_pw@@@';
+$conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
 
 /* What account should we use to read/write calendar data? This
  * account should have access to the calendar mailbox of all