summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-05-16 06:58:53 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-05-16 06:58:53 (GMT)
commit517054d95ed3b9cbe14424ee67818ed444195ec5 (patch)
tree2a883a3d4eb7be40953a5154d9dd3d6017deda82
parent910668ddd3144c353ab279c459e56f9ef6e9b3fe (diff)
downloadkolab-server-517054d95ed3b9cbe14424ee67818ed444195ec5.tar.gz
freebusy.conf.template.in moved to the Kolab_FreeBusy package.
-rw-r--r--ChangeLog12
-rw-r--r--conf/kolab.globals.in7
2 files changed, 19 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d31996..580d616 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-05-16 Gunnar Wrobel <p@rdus.de>
+
+ * Makefile.am (kolabtemplate_DATA): freebusy.conf.template.in
+ moved to the Kolab_FreeBusy package.
+
+ * kolab.globals.in (freebusy_*): Add the freebusy variables into
+ the global parameter list so that the freebusy.conf.template.in
+ can be removed.
+
+ * templates/freebusy.conf.template.in: Moved to the Kolab_FreeBusy
+ package.
+
2010-05-04 Thomas Arendsen Hein <thomas@intevation.de>
* templates/imapd.annotation_definitions.template.in:
diff --git a/conf/kolab.globals.in b/conf/kolab.globals.in
index 64e9591..c223ec8 100644
--- a/conf/kolab.globals.in
+++ b/conf/kolab.globals.in
@@ -90,3 +90,10 @@ kolab_wui : @kolab_wui@
syncrepl_cookie_file : @kolab_statedir@/syncrepl_cookie
imap_confdir : @imap_confdir@
imappartitions_script : @sbindir@/kolab_imappartitions
+freebusy_confdir: @freebusy_confdir@
+freebusy_usr: @freebusy_usr@
+freebusy_grp: @freebusy_grp@
+freebusy_log_type: @freebusy_log_type@
+freebusy_log_name: @freebusy_log_name@
+freebusy_logdir: @freebusy_logdir@
+freebusy_cachedir: @freebusy_cachedir@