richard: server/kolabd/kolabd/dist_conf common, 1.9, 1.10 kolab, 1.13, 1.14 suse, 1.10, 1.11

cvs at intevation.de cvs at intevation.de
Fri Dec 30 11:46:29 CET 2005


Author: richard

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

Modified Files:
	common kolab suse 
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: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- common	30 Dec 2005 10:25:21 -0000	1.9
+++ common	30 Dec 2005 10:46:27 -0000	1.10
@@ -110,4 +110,5 @@
 	-e 's,[@]webserver_sessions[@],$(webserver_sessions),g' \
 	-e 's,[@]webserver_sslmutex[@],$(webserver_sslmutex),g' \
 	-e 's,[@]webserver_sslscache[@],$(webserver_sslscache),g' \
-	-e 's,[@]webserver_usr[@],$(webserver_usr),g'
+	-e 's,[@]webserver_usr[@],$(webserver_usr),g' \
+	-e 's,[@]webserver_web_prefix[@],$(webserver_web_prefix),g'

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- kolab	30 Dec 2005 10:25:21 -0000	1.13
+++ kolab	30 Dec 2005 10:46:27 -0000	1.14
@@ -132,6 +132,8 @@
 webserver_mime_typesfile=${sysconfdir}/apache/mime.types
 webserver_sslscache=${webserver_logdir}/ssl_scache
 webserver_sslmutex=${webserver_logdir}/ssl_mutex
+# webserver_web_prefix is empty indeed
+webserver_web_prefix=
 webserver_musr=kolab
 webserver_usr=${kolab_usr}
 webserver_grp=${kolab_grp}

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- suse	30 Dec 2005 10:25:21 -0000	1.10
+++ suse	30 Dec 2005 10:46:27 -0000	1.11
@@ -110,6 +110,7 @@
 webserver_mime_typesfile=${sysconfdir}/apache2/mime.types
 webserver_sslscache=${webserver_logdir}/ssl_scache
 webserver_sslmutex=${webserver_logdir}/ssl_mutex
+webserver_web_prefix=/kolab
 webserver_musr=kolab
 webserver_usr=wwwrun
 webserver_grp=www





More information about the commits mailing list