summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2009-03-26 21:29:45 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2009-03-26 21:29:45 (GMT)
commit07d78df6ce0656177cf1cd78241496feb5e34161 (patch)
tree3e099b321c59a51f821e1633fb501b6726ffcf79
parent9ee56f8b3a56a91c5257090018749b69801f450b (diff)
downloadkolab-conf-07d78df6ce0656177cf1cd78241496feb5e34161.tar.gz
Prepare kolabd for kolab/issue3420 (web client prefs and hooks should be configurable via templates)
-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 cd49a5d..334c02d 100644
--- a/conf/dist/common
+++ b/conf/dist/common
@@ -149,4 +149,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 6059539..b9e6c4d 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 6a93b58..819f0a8 100644
--- a/conf/kolab.globals.in
+++ b/conf/kolab.globals.in
@@ -51,7 +51,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@