gunnar: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.9, 1.10 resmgr.conf.template.in, 1.9, 1.10

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	freebusy.conf.template.in resmgr.conf.template.in 
Log Message:
Make this package ready for the replacement of kolab-resource-handlers.

Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- freebusy.conf.template.in	3 Aug 2007 10:33:27 -0000	1.9
+++ freebusy.conf.template.in	16 Aug 2007 10:47:10 -0000	1.10
@@ -1,10 +1,44 @@
 KOLAB_META_START
-TARGET=@resmgr_confdir@/freebusy.conf
+TARGET=@freebusy_confdir@/config.php
 PERMISSIONS=0640
 OWNERSHIP=@freebusy_usr@:@freebusy_grp@
 KOLAB_META_END
 <?php
 
+/*  
+ *  COPYRIGHT
+ *  ---------
+ *
+ *  See docs/AUTHORS file
+ *
+ *
+ *  LICENSE
+ *  -------
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *  $Revision$
+ *
+ *  ABOUT
+ *  -----
+ *
+ *  This file provides configuration settings for both the
+ *  freebusy.php and the pfb.php scripts.
+ *
+ */
+
 // Kolab prefix
 $params['kolab_prefix'] = '@prefix@';
 
@@ -115,11 +149,11 @@
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 //
 // If you modify this file, please do not forget to modify both the
-// template and the source file in kolab-resource-handler.
+// template in kolabd and the source file in kolab-freebusy
 //
 // In order to check if both are in sync:
 //
 // cd server
-// diff -Nau kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.conf kolabd/kolabd/templates/freebusy.conf.template.in
+// diff -Nau kolab-freebusy/freebusy/config.php kolabd/kolabd/templates/freebusy.conf.template.in
 //
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- resmgr.conf.template.in	1 May 2007 08:16:54 -0000	1.9
+++ resmgr.conf.template.in	16 Aug 2007 10:47:10 -0000	1.10
@@ -1,12 +1,43 @@
 KOLAB_META_START
-TARGET=@resmgr_confdir@/resmgr.conf
+TARGET=@resmgr_confdir@/config.php
 PERMISSIONS=0640
 OWNERSHIP=@resmgr_conffile_usr@:@resmgr_conffile_grp@
 KOLAB_META_END
 <?php
 
-// What is the root directory of our Horde instance?
- at define('HORDE_BASE', '@webserver_document_root@@webserver_web_prefix@/fbview');
+/*  
+ *  COPYRIGHT
+ *  ---------
+ *
+ *  See docs/AUTHORS file
+ *
+ *
+ *  LICENSE
+ *  -------
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *  $Revision$
+ *
+ *  ABOUT
+ *  -----
+ *
+ *  This file provides configuration settings for both the
+ *  kolabfilter.php and the kolabmailboxfilter.php scripts.
+ *
+ */
 
 // What is the address of the Cyrus server where the calendar data is stored?
 $params['server'] = 'localhost';
@@ -100,4 +131,25 @@
 // What level of output should we log? Higher levels give more verbose output.
 // One of: RM_LOG_SILENT; RM_LOG_ERROR; RM_LOG_WARN; RM_LOG_INFO or RM_LOG_DEBUG.
 $params['log_level'] = RM_LOG_DEBUG;
+
+// Temporary data storage for the script
+$params['resmgr_filterdir'] = '@resmgr_filterdir@';
+
+// Activate if you wish to use the new horde framework
+// (horde-framework-kolab) package instead of the old code in
+// kolab-horde-framework. This is still untested and considered
+// UNSAFE!
+$params['use_new_horde'] = false;
+
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+//
+// If you modify this file, please do not forget to modify both the
+// template in kolabd and the source file in kolab-freebusy
+//
+// 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
+//
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ?>