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)
commitaf261b276cbc0bad1fac07fa33770aad5ed89939 (patch)
treea36174c649fa9627e6e5becc226a7c43e626107f
parent44cc2ba690078b831226222dae9ae151c1356ca6 (diff)
downloadkolab-conf-af261b276cbc0bad1fac07fa33770aad5ed89939.tar.gz
kolab/issue4512 (Allow to hide the admin mail settings in the web admin)
-rw-r--r--conf/dist/common2
-rw-r--r--conf/kolab.globals.in6
2 files changed, 7 insertions, 1 deletions
diff --git a/conf/dist/common b/conf/dist/common
index 8332415..bf4372c 100644
--- a/conf/dist/common
+++ b/conf/dist/common
@@ -115,8 +115,10 @@ do_subst = sed \
-e 's=[@]ldapserver_usr[@]=$(ldapserver_usr)=g' \
-e 's=[@]ldapserver_modulepath[@]=$(ldapserver_modulepath)=g' \
-e 's=[@]pear_horde_pkgs[@]=$(pear_horde_pkgs)=g' \
+ -e 's=[@]phplibdir2[@]=$(phplibdir2)=g' \
-e 's=[@]pkgdocdir[@]=$(pkgdocdir)=g' \
-e 's=[@]pki_grp[@]=$(pki_grp)=g' \
+ -e 's=[@]prefix[@]=$(prefix)=g' \
-e 's=[@]resmgr_confdir[@]=$(resmgr_confdir)=g' \
-e 's=[@]resmgr_conffile_grp[@]=$(resmgr_conffile_grp)=g' \
-e 's=[@]resmgr_conffile_usr[@]=$(resmgr_conffile_usr)=g' \
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@