summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2009-11-10 20:42:00 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2009-11-10 20:42:00 (GMT)
commit44bbaa9120c2042d775faeea0041c696657a0139 (patch)
treea97227a2cba1c3989ea2c7065a4711dcfc062bc1
parente331a472c28e99cd7b2c7d330b1e9f31af58e9df (diff)
downloadkolab-conf-44bbaa9120c2042d775faeea0041c696657a0139.tar.gz
Merge configuration for kolab/issue2499 from HEAD
-rw-r--r--conf/dist/common1
-rw-r--r--conf/dist/kolab1
-rw-r--r--conf/templates/resmgr.conf.template.in4
3 files changed, 6 insertions, 0 deletions
diff --git a/conf/dist/common b/conf/dist/common
index 334c02d..a3a687e 100644
--- a/conf/dist/common
+++ b/conf/dist/common
@@ -120,6 +120,7 @@ do_subst = sed \
-e 's,[@]resmgr_conffile_usr[@],$(resmgr_conffile_usr),g' \
-e 's,[@]resmgr_tmpdir[@],$(resmgr_tmpdir),g' \
-e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
+ -e 's,[@]resmgr_localedir[@],$(resmgr_localedir),g' \
-e 's,[@]resmgr_logdir[@],$(resmgr_logdir),g' \
-e 's,[@]resmgr_scriptsdir[@],$(resmgr_scriptsdir),g' \
-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
diff --git a/conf/dist/kolab b/conf/dist/kolab
index b9e6c4d..a9e918c 100644
--- a/conf/dist/kolab
+++ b/conf/dist/kolab
@@ -175,6 +175,7 @@ resmgr_confdir=$(sysconfdir)/kolab
resmgr_conffile_usr=${kolab_musr}
resmgr_conffile_grp=${kolab_grp}
resmgr_tmpdir=${localstatedir}/kolab-filter/tmp
+resmgr_localedir=${libdir}/php/data/Kolab_Filter/locale
resmgr_scriptsdir=${bindir}
# @l_musr@
resmgr_usr=${kolab_musr}
diff --git a/conf/templates/resmgr.conf.template.in b/conf/templates/resmgr.conf.template.in
index 173899b..7ad9aea 100644
--- a/conf/templates/resmgr.conf.template.in
+++ b/conf/templates/resmgr.conf.template.in
@@ -175,6 +175,10 @@ $conf['kolab']['freebusy']['server'] = 'https://@@@fqdnhostname@@@/freebusy';
/* Temporary data storage for the scripts */
$conf['kolab']['filter']['tempdir'] = '@resmgr_tmpdir@';
+/* Uncomment if the resource manager should generate translated messages. */
+//$conf['kolab']['filter']['locale_path'] = '@resmgr_localedir@';
+//$conf['kolab']['filter']['locale'] = 'de_DE';
+
/* PHP error logging */
$conf['kolab']['filter']['error_log'] = '@resmgr_logdir@/fatal.log';