[Kolab-devel] gunnar: server/kolab-filter/filter config.php, 1.3, 1.4 kolabfilter.php, 1.2, 1.3 kolabmailboxfilter.php, 1.2, 1.3

[Richard Bos]

Hi Gunnar,

Op Monday 26 November 2007 21:15:16 schreef Gunnar Wrobel:
> > I'm a bit confused about the config files, that define more or less the
> > same variables.
> >
> > At the end of server/kolab-filter/filter config.php is stated:
> >
> > // In order to check if both are in sync:
> > //
> > // cd server
> > // diff -Nau kolab-filter/filter/config.php
> > kolabd/kolabd/templates/resmgr.conf.template.in
> >
> > If one performs that diff, it is rather big, I think to big and it makes
> > it hard to judge whether they are sync or not.  Especially now params has
> > been changed to conf.
> > Is it possible to merge the 2 files, or let kolab-filter use the resmgr
> > config file?
>
> I'll merge them tomorrow when I'm doing the installation testing. This
> was just my commit for today. I'm currently a little bit in a hurry to
> get things done before the next release and that's why this is a
> partially sloppy commit. But thanks for reminding me to not do such
> things since I am no fan of breaking CVS either. So I should try to
> stick to my own standards

it's in sync again, but why the differences, for example:
--- kolab-filter/filter/config.php      2007-11-29 09:27:19.000000000 +0100
+++ kolabd/kolabd/templates/resmgr.conf.template.in     2007-11-29 
09:27:18.000000000 +0100
.........................
@@ -37,7 +42,7 @@
 $conf = array();

 /* Cyrus server connection string */
-$conf['filter']['imap_server'] = 'localhost';
+$conf['filter']['imap_server'] = '@@@connect_addr@@@';

 /* LMTP settings (Cyrus IMAPd usually offers LMTP on port 2003) */
 $conf['filter']['lmpt_host'] = $conf['filter']['imap_server'];
@@ -46,20 +51,20 @@
 /* SMTP settings (Kolab Postfix usually offers reinjection port on
  * 10025)
  */
-$conf['filter']['smpt_host'] = 'localhost';
+$conf['filter']['smpt_host'] = '@@@local_addr@@@';
 $conf['filter']['smpt_port'] = 10025;

 /* Local IP address of the mailserver for bypassing content filters */
-$conf['filter']['local_addr'] = 'localhost';
+$conf['filter']['local_addr'] = '@@@local_addr@@@';

 /* What is our default mail domain? This is used if any users do not
  * have '@domain' specified after their username as part of their
  * email address.
  */
-$conf['filter']['email_domain'] = 'example.com';
+$conf['filter']['email_domain'] = '@@@postfix-mydomain@@@';

 /* List of kolab hosts that are privileged */
-$conf['filter']['kolabhosts'] 
= 'one.example.com,two.example.com,three.example.com';
+$conf['filter']['kolabhosts'] = '@@@kolabhost|join(,)@@@';

 /* Are we using virtual domains with Cyrus? */
 $conf['filter']['virtual_domains'] = true;



In which file is filter/config.php used (I could not find it, in the modules I 
have checked out)?  It looks like filter/config.php is used as to determine 
default values that are shown to a user on a for example a configuration 
webpage.


-- 
Richard