summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-08-23 14:10:06 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-08-23 14:10:06 (GMT)
commit5e3cf5a08c34a79d60b3dcd6da218ac718a275f9 (patch)
tree00db87eeac7d7a11adbbc3d4963dfc5da286d5a3
parent49737ab056d92596879e68fe0fbbfa1a06bbced2 (diff)
downloadkolab-server-5e3cf5a08c34a79d60b3dcd6da218ac718a275f9.tar.gz
kolab/issue4512 (Allow to hide the admin mail settings in the web admin)
-rw-r--r--ChangeLog9
-rw-r--r--conf/kolab.globals.in6
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c01d43..4473a11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-23 Gunnar Wrobel <p@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@rdus.de>
* kolab.globals.in, rc.kolabd.in:
diff --git a/conf/kolab.globals.in b/conf/kolab.globals.in
index 2951a1f..ed2ad44 100644
--- a/conf/kolab.globals.in
+++ b/conf/kolab.globals.in
@@ -56,6 +56,7 @@ bindir: @bindir@
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 @@ LDAPD : @LDAPD@
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_locksdir: @resmgr_locksdir@
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@