gunnar: server/kolabd/kolabd kolab.globals.in, 1.32, 1.33 ChangeLog, 1.300, 1.301

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	kolab.globals.in ChangeLog 
Log Message:
kolab/issue4512 (Allow to hide the admin mail settings in the web admin)

Index: kolab.globals.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- kolab.globals.in	21 Jul 2010 17:44:38 -0000	1.32
+++ kolab.globals.in	23 Aug 2010 14:10:06 -0000	1.33
@@ -56,6 +56,7 @@
 sbindir: @sbindir@
 webserver_logdir: @webserver_logdir@
 webserver_document_root: @webserver_document_root@
+webserver_musr: @webserver_musr@
 webserver_usr: @webserver_usr@
 webserver_grp: @webserver_grp@
 webclient_data_root: @webclient_data_root@
@@ -97,7 +98,6 @@
 kolab_scriptsdir : @kolab_scriptsdir@
 pki_grp : @pki_grp@
 TAR : @TAR@
-kolab_wui : @kolab_wui@
 syncrepl_cookie_file : @kolab_statedir@/syncrepl_cookie
 imap_confdir : @imap_confdir@
 imappartitions_script : @sbindir@/kolab_imappartitions
@@ -117,3 +117,7 @@
 resmgr_logdir: @resmgr_logdir@
 resmgr_log_type: @resmgr_log_type@
 resmgr_log_name: @resmgr_log_name@
+kolab_wui : @kolab_wui@
+kolab_php_module_prefix : @kolab_php_module_prefix@
+prefix : @prefix@
+phplibdir2 : @phplibdir2@

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -d -r1.300 -r1.301
--- ChangeLog	21 Jul 2010 17:44:38 -0000	1.300
+++ ChangeLog	23 Aug 2010 14:10:06 -0000	1.301
@@ -1,3 +1,12 @@
+2010-08-23  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab.globals.in:
+	* dist_conf/common: 
+
+	Add a few more variables to the kolab.globals file to support a
+	decent configuration template for the Kolab webadmin.
+	kolab/issue4512 (Allow to hide the admin mail settings in the web admin)
+
 2010-07-21  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab.globals.in, rc.kolabd.in: