richard: server/kolabd/kolabd/templates fbview.conf.template.in, 1.1, 1.2 resmgr.conf.template.in, 1.2, 1.3

[cvs at intevation.de]

Author: richard

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

Modified Files:
	fbview.conf.template.in resmgr.conf.template.in 
Log Message:
Add a  webserver prefix.  The latter means that kolab will be reachable  
at e.g. https://www.domain.tld/kolab instead of just https://www.domain.tld/  
 
This is done by the adding a variable web_server_prefix.  In case of just 
kolab this variable is left empty and nothing changes compared to the old 
situation. 
Other (distributions) could define this variable and the webserver prefix
is than added during build time. 

* templates/resmgr.conf.template.in,
  templates/fbview.conf.template.in: added
  @webserver_web_prefix@ (we did what Mandriva already had done!)
* dist_conf/{kolab,suse,common}: added @webserver_web_prefix@



Index: fbview.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/fbview.conf.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fbview.conf.template.in	13 Sep 2005 14:38:22 -0000	1.1
+++ fbview.conf.template.in	30 Dec 2005 10:46:27 -0000	1.2
@@ -37,4 +37,4 @@
 $params['calendar_store'] = 'Calendar';
 
 // Where can we get free/busy information from?
-$params['freebusy_url'] = 'https://'.urlencode($params['calendar_user']).':'.urlencode($params['calendar_pass']).'@'.'@@@fqdnhostname@@@/freebusy/${USER}.xfb';
+$params['freebusy_url'] = 'https://'.urlencode($params['calendar_user']).':'.urlencode($params['calendar_pass']).'@'.'@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/${USER}.xfb';

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- resmgr.conf.template.in	13 Oct 2005 23:56:51 -0000	1.2
+++ resmgr.conf.template.in	30 Dec 2005 10:46:27 -0000	1.3
@@ -6,7 +6,7 @@
 <?php
 
 // What is the root directory of our Horde instance?
- at define('HORDE_BASE', '@webserver_document_root@/fbview');
+ at define('HORDE_BASE', '@webserver_document_root@@webserver_web_prefix@/fbview');
 
 // What is the address of the Cyrus server where the calendar data is stored?
 $params['server'] = 'localhost';
@@ -75,7 +75,7 @@
 $params['freebusy_url'] = 'https://@@@fqdnhostname@@@/freebusy/${USER}.xfb';
  
 // PFB url to trigger creation of pfb
-$params['pfb_trigger_url'] = 'https://@@@fqdnhostname@@@/freebusy/trigger/${USER}/${FOLDER}.xpfb';
+$params['pfb_trigger_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/trigger/${USER}/${FOLDER}.xpfb';
 
 // Where are we logging to?
 $params['log'] = 'file:@resmgr_logfile@';                // File...