summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2009-04-24 05:01:23 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2009-04-24 05:01:23 (GMT)
commit486467d1a775581bcef9c3fe0040992cb58b7fb2 (patch)
tree7be3801b9355d1b81c95b276b319a8a6121104d6
parent5b3dd54008faf62a9ef8cdf4d741907bc6071224 (diff)
downloadkolab-conf-486467d1a775581bcef9c3fe0040992cb58b7fb2.tar.gz
Merge from branch
(Prepare kolabd for kolab/issue3420 (web client prefs and hooks should be configurable via templates) cvs diff -u -d -r1.234 -r1.234.2.1 ChangeLog | patch ChangeLog cvs diff -u -d -r1.22 -r1.22.2.1 kolab.globals.in | patch kolab.globals.in cvs diff -u -d -r1.53 -r1.53.2.1 dist_conf/common | patch dist_conf/common cvs diff -u -d -r1.70 -r1.70.2.1 dist_conf/kolab | patch dist_conf/kolab)
-rw-r--r--conf/dist/common9
-rw-r--r--conf/dist/kolab7
-rw-r--r--conf/kolab.globals.in7
3 files changed, 22 insertions, 1 deletions
diff --git a/conf/dist/common b/conf/dist/common
index 159dd9d..5da5a71 100644
--- a/conf/dist/common
+++ b/conf/dist/common
@@ -151,4 +151,11 @@ do_subst = sed \
-e 's=[@]webserver_web_prefix[@]=$(webserver_web_prefix)=g' \
-e 's=[@]horde_cookie_path[@]=$(horde_cookie_path)=g' \
-e 's=[@]horde_confdir[@]=$(horde_confdir)=g' \
- -e 's=[@]kronolith_confdir[@]=$(kronolith_confdir)=g'
+ -e 's=[@]dimp_confdir[@]=$(dimp_confdir)=g' \
+ -e 's=[@]imp_confdir[@]=$(imp_confdir)=g' \
+ -e 's=[@]ingo_confdir[@]=$(ingo_confdir)=g' \
+ -e 's=[@]kronolith_confdir[@]=$(kronolith_confdir)=g' \
+ -e 's=[@]mimp_confdir[@]=$(mimp_confdir)=g' \
+ -e 's=[@]mnemo_confdir[@]=$(mnemo_confdir)=g' \
+ -e 's=[@]nag_confdir[@]=$(nag_confdir)=g' \
+ -e 's=[@]turba_confdir[@]=$(turba_confdir)=g'
diff --git a/conf/dist/kolab b/conf/dist/kolab
index 40b8054..e0c1ec1 100644
--- a/conf/dist/kolab
+++ b/conf/dist/kolab
@@ -150,7 +150,14 @@ webserver_grp=${kolab_grp}
#webclient
horde_cookie_path=/client
horde_confdir=${webserver_document_root}/client/config
+dimp_confdir=${webserver_document_root}/client/dimp/config
+imp_confdir=${webserver_document_root}/client/imp/config
+ingo_confdir=${webserver_document_root}/client/ingo/config
kronolith_confdir=${webserver_document_root}/client/kronolith/config
+mimp_confdir=${webserver_document_root}/client/mimp/config
+mnemo_confdir=${webserver_document_root}/client/mnemo/config
+nag_confdir=${webserver_document_root}/client/nag/config
+turba_confdir=${webserver_document_root}/client/turba/config
phpini_dir=${sysconfdir}/apache
phplibdir=${libdir}/php
diff --git a/conf/kolab.globals.in b/conf/kolab.globals.in
index d413b46..5f42a77 100644
--- a/conf/kolab.globals.in
+++ b/conf/kolab.globals.in
@@ -50,7 +50,14 @@ webserver_usr: @webserver_usr@
webserver_grp: @webserver_grp@
horde_cookie_path: @horde_cookie_path@
horde_confdir: @horde_confdir@
+dimp_confdir: @dimp_confdir@
+ingo_confdir: @ingo_confdir@
+imp_confdir: @imp_confdir@
kronolith_confdir: @kronolith_confdir@
+mimp_confdir: @mimp_confdir@
+mnemo_confdir: @mnemo_confdir@
+nag_confdir: @nag_confdir@
+turba_confdir: @turba_confdir@
kolab_statedir: @kolab_statedir@
kolab_pidfile: @kolab_pidfile@
kolab_mailboxuiddb: @kolab_mailboxuiddb@