martin: server/kolabd/kolabd kolab.conf,1.2,1.3 kolabd.in,1.7,1.8

cvs at kolab.org cvs at kolab.org
Tue Feb 26 07:04:02 CET 2008


Author: martin

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv27041/kolabd/kolabd

Modified Files:
	kolab.conf kolabd.in 
Log Message:
Martin Konold: applied patch from mathieu.parent. It makes the syslog_facility configurable via kolab.conf, E,g, it is 
possible to send the syslog messages to local5. The default preserves the old behaviour ('user'). 
https://www.intevation.de/roundup/kolab/issue2446 


Index: kolab.conf
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab.conf	8 Oct 2007 15:21:20 -0000	1.2
+++ kolab.conf	26 Feb 2008 06:04:00 -0000	1.3
@@ -10,5 +10,6 @@
 ldap_master_uri : @@@ldap_master_uri@@@
 php_dn : cn=nobody,@@@kolab_basedn@@@
 php_pw : @@@nobody_pw@@@
+syslog_facility : user
 slurpd_addr : 127.0.0.1
 slurpd_port : 9999

Index: kolabd.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolabd.in	2 Aug 2007 06:49:43 -0000	1.7
+++ kolabd.in	26 Feb 2008 06:04:00 -0000	1.8
@@ -49,7 +49,7 @@
 
 Kolab::reloadConfig("@sysconfdir@/kolab/kolab.globals");
 
-openlog('kolabd', 'cons, pid', 'user');
+openlog('kolabd', 'cons, pid', ($Kolab::config{'syslog_facility'} || 'user'));
 
 # won't be needed now (i think)
 # my $prefix = $Kolab::config{'prefix'};





More information about the commits mailing list