gunnar: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.17, 1.18

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	resmgr.conf.template.in 
Log Message:
kolab-filter configuration file fixes as suggested by Richard Bos.

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- resmgr.conf.template.in	29 Nov 2007 14:37:37 -0000	1.17
+++ resmgr.conf.template.in	3 Dec 2007 08:43:36 -0000	1.18
@@ -82,9 +82,9 @@
  * that origins on this server?
  */
 @@@if kolabfilter-verify-from-header@@@
-$params['verify_from_header'] = ('@@@kolabfilter-verify-from-header@@@'=='TRUE');
+$conf['filter']['verify_from_header'] = ('@@@kolabfilter-verify-from-header@@@'=='TRUE');
 @@@else@@@
-$params['verify_from_header'] = false;
+$conf['filter']['verify_from_header'] = false;
 @@@endif@@@
 
 /* Should we perform this check on mail from our
@@ -94,18 +94,18 @@
 
 /* Should the Sender: header be used over From: if present? */
 @@@if kolabfilter-allow-sender-header@@@
-$params['allow_sender_header'] = ('@@@kolabfilter-allow-sender-header@@@'=='TRUE');
+$conf['filter']['allow_sender_header'] = ('@@@kolabfilter-allow-sender-header@@@'=='TRUE');
 @@@else@@@
-$params['allow_sender_header'] = false;
+$conf['filter']['allow_sender_header'] = false;
 @@@endif@@@
 
 /* Should reject messages with From headers that dont match
  * the envelope? Default is to rewrite the header
  */
 @@@if kolabfilter-reject-forged-from-header@@@
-$params['reject_forged_from_header'] = ('@@@kolabfilter-reject-forged-from-header@@@'=='TRUE');
+$conf['filter']['reject_forged_from_header'] = ('@@@kolabfilter-reject-forged-from-header@@@'=='TRUE');
 @@@else@@@
-$params['reject_forged_from_header'] = false;
+$conf['filter']['reject_forged_from_header'] = false;
 @@@endif@@@
 
 /* Text to be inserted in From: when rewriting untrusted mails */
@@ -148,7 +148,7 @@
 $conf['filter']['calendar_store'] = 'Calendar';
 
 /* Where can we get free/busy information from? */
-$conf['filter']['freebusy_url'] = '@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/${USER}.xfb';
+$conf['filter']['freebusy_url'] = 'http://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/${USER}.xfb';
  
 /* PFB url to trigger creation of pfb */
 $conf['filter']['pfb_trigger_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/trigger/${USER}/${FOLDER}.xpfb';