allow to configure resmgr and freebusy logging via dist_conf

8 files changed, 33 insertions, 6 deletions

diff --git a/conf/dist/centos-clarkconnect b/conf/dist/centos-clarkconnect
index 8ca15f7..091abb2 100644
--- a/conf/dist/centos-clarkconnect
+++ b/conf/dist/centos-clarkconnect
@@ -231,7 +231,7 @@ sasl_logfile=${localstatedir}/log/messages
 # CentOS/RHEL: watch out for resmgr_conffile_usr
 
 #*************************************** HERE ************************************************************
-resmgr_logfile=${localstatedir}/log/maillog
+resmgr_logdir=${localstatedir}/log
 resmgr_confdir=${sysconfdir}/resmgr
 resmgr_conffile_usr=filter
 resmgr_conffile_grp=root
@@ -239,11 +239,15 @@ resmgr_filterdir=${localstatedir}/spool/resmgr
 resmgr_usr=root
 resmgr_grp=root
 resmgr_scriptsdir=/usr/sbin
+resmgr_log_type=file
+resmgr_log_name=${resmgr_logdir}/filter.log
 
 fbview_logfile=/var/lib/resmgr/fbview.log
-freebusy_logfile=/var/log/resmgr/freebusy.log
+freebusy_logdir=/var/log/resmgr
 freebusy_confdir=${webserver_document_root}/kolab/freebusy
 freebusy_cachedir=${webserver_document_root}/kolab/freebusy/cache
+freebusy_log_type=file
+freebusy_log_name=${freebusy_logdir}/freebusy.log
 
 # Total guess
 freebusy_usr=root
diff --git a/conf/dist/common b/conf/dist/common
index d091563..cd49a5d 100644
--- a/conf/dist/common
+++ b/conf/dist/common
@@ -60,6 +60,8 @@ do_subst = sed \
 	-e 's,[@]freebusy_grp[@],$(freebusy_grp),g' \
 	-e 's,[@]freebusy_logdir[@],$(freebusy_logdir),g' \
 	-e 's,[@]freebusy_usr[@],$(freebusy_usr),g' \
+	-e 's,[@]freebusy_log_type[@],$(freebusy_log_type),g' \
+	-e 's,[@]freebusy_log_name[@],$(freebusy_log_name),g' \
 	-e 's,[@]freshclam_logfile[@],$(freshclam_logfile),g' \
 	-e 's,[@]freshclam_pidfile[@],$(freshclam_pidfile),g' \
 	-e 's,[@]fsl_logfile[@],$(fsl_logfile),g' \
@@ -121,6 +123,8 @@ do_subst = sed \
 	-e 's,[@]resmgr_logdir[@],$(resmgr_logdir),g' \
 	-e 's,[@]resmgr_scriptsdir[@],$(resmgr_scriptsdir),g' \
 	-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
+	-e 's,[@]resmgr_log_type[@],$(resmgr_log_type),g' \
+	-e 's,[@]resmgr_log_name[@],$(resmgr_log_name),g' \
 	-e 's,[@]sasl_authdconffile[@],$(sasl_authdconffile),g' \
 	-e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \
 	-e 's,[@]sasl_smtpconffile[@],$(sasl_smtpconffile),g' \
diff --git a/conf/dist/debian b/conf/dist/debian
index 81f9037..029fb9d 100644
--- a/conf/dist/debian
+++ b/conf/dist/debian
@@ -152,6 +152,8 @@ resmgr_scriptsdir=${bindir}
 resmgr_usr=root
 resmgr_grp=www-data
 resmgr_filterdir=${kolab_statedir}/resmgr/filter
+resmgr_log_type=syslog
+resmgr_log_name=cons, pid
 
 fbview_logfile=${localstatedir}/log/fbview.log
 freebusy_logdir=${localstatedir}/log
@@ -159,6 +161,8 @@ freebusy_confdir=${sysconfdir}/kolab/freebusy
 freebusy_cachedir=${kolab_statedir}/freebusy-cache
 freebusy_usr=root
 freebusy_grp=www-data
+freebusy_log_type=syslog
+freebusy_log_name=cons, pid
 
 graveyard_uidcache=${kolab_statedir}/graveyard_uidcache.db
 graveyard_tscache=${kolab_statedir}/graveyard_tscache.db
diff --git a/conf/dist/kolab b/conf/dist/kolab
index 6597944..6059539 100644
--- a/conf/dist/kolab
+++ b/conf/dist/kolab
@@ -173,6 +173,8 @@ resmgr_scriptsdir=${bindir}
 resmgr_usr=${kolab_musr}
 # @l_ngrp@
 resmgr_grp=${kolab_grp}
+resmgr_log_type=file
+resmgr_log_name=${resmgr_logdir}/filter.log
 
 fbview_logfile=${localstatedir}/resmgr/fbview.log
 freebusy_logdir=${localstatedir}/kolab-freebusy/log
@@ -180,6 +182,8 @@ freebusy_confdir=${webserver_document_root}/freebusy
 freebusy_cachedir=${localstatedir}/kolab-freebusy/cache
 freebusy_usr=${kolab_musr}
 freebusy_grp=${kolab_grp}
+freebusy_log_type=file
+freebusy_log_name=${freebusy_logdir}/freebusy.log
 
 graveyard_uidcache=${kolab_statedir}/graveyard-uidcache.db
 graveyard_tscache=${kolab_statedir}/graveyard-tscache.db
diff --git a/conf/dist/mandriva b/conf/dist/mandriva
index ec8088e..7b731bb 100644
--- a/conf/dist/mandriva
+++ b/conf/dist/mandriva
@@ -72,4 +72,11 @@ sysrundir = /var/run
 
 resmgr_scriptsdir=${resmgr_confdir}
 smarty_compiledir=${phplibdir2}/${kolab_php_module_prefix}admin/templates_c
+resmgr_logdir=${localstatedir}/kolab-filter/log
+resmgr_log_type=file
+resmgr_log_name=${resmgr_logdir}/filter.log
+
+freebusy_logdir=${localstatedir}/kolab-freebusy/log
+freebusy_log_type=file
+freebusy_log_name=${freebusy_logdir}/freebusy.log
 
diff --git a/conf/dist/suse b/conf/dist/suse
index 6a2cacd..c1ddea9 100644
--- a/conf/dist/suse
+++ b/conf/dist/suse
@@ -157,6 +157,8 @@ resmgr_conffile_grp=root
 resmgr_filterdir=${localstatedir}/lib/kolab/kolab-filter/tmp
 resmgr_usr=root
 resmgr_grp=root
+resmgr_log_type=file
+resmgr_log_name=${resmgr_logdir}/filter.log
 
 fbview_logfile=${localstatedir}/log/kolab/fbview.log
 freebusy_logdir=${localstatedir}/log/kolab/freebusy
@@ -164,6 +166,8 @@ freebusy_confdir=${webserver_document_root}${webserver_web_prefix}/freebusy
 freebusy_cachedir=${localstatedir}/cache/freebusy
 freebusy_usr=wwwrun
 freebusy_grp=root
+freebusy_log_type=file
+freebusy_log_name=${freebusy_logdir}/freebusy.log
 
 graveyard_uidcache=${kolab_statedir}/graveyard-uidcache.db
 graveyard_tscache=${kolab_statedir}/graveyard-tscache.db
diff --git a/conf/templates/freebusy.conf.template.in b/conf/templates/freebusy.conf.template.in
index c59b89d..cf61659 100644
--- a/conf/templates/freebusy.conf.template.in
+++ b/conf/templates/freebusy.conf.template.in
@@ -44,8 +44,8 @@ $conf = array();
 /* Horde::Log configuration */
 $conf['log']['enabled']          = true;
 $conf['log']['priority']         = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
-$conf['log']['type']             = 'file';
-$conf['log']['name']             = '@freebusy_logdir@/freebusy.log';
+$conf['log']['type']             = '@freebusy_log_type@';
+$conf['log']['name']             = '@freebusy_log_name@';
 $conf['log']['ident']            = 'Kolab Free/Busy';
 $conf['log']['params']['append'] = true;
 
diff --git a/conf/templates/resmgr.conf.template.in b/conf/templates/resmgr.conf.template.in
index 45d2ea6..247b1eb 100644
--- a/conf/templates/resmgr.conf.template.in
+++ b/conf/templates/resmgr.conf.template.in
@@ -179,8 +179,8 @@ $conf['use_ssl'] = 0;
  */
 $conf['log']['enabled']          = true;
 $conf['log']['priority']         = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
-$conf['log']['type']             = 'file';
-$conf['log']['name']             = '@resmgr_logdir@/filter.log';
+$conf['log']['type']             = '@resmgr_log_type@';
+$conf['log']['name']             = '@resmgr_log_name@';
 $conf['log']['ident']            = 'Kolab Filter';
 $conf['log']['params']['append'] = true;