mathieu: server/kolabd/kolabd/dist_conf centos-clarkconnect, 1.12, 1.13 common, 1.49, 1.50 debian, 1.19, 1.20 kolab, 1.64, 1.65 mandriva, 1.12, 1.13 suse, 1.79, 1.80

[cvs at kolab.org]

Author: mathieu

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

Modified Files:
	centos-clarkconnect common debian kolab mandriva suse 
Log Message:
kolab/issue2446 (Make the used syslog facility configureable (kolabd, kolabconf))


Index: centos-clarkconnect
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/centos-clarkconnect,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- centos-clarkconnect	19 Mar 2008 21:43:15 -0000	1.12
+++ centos-clarkconnect	18 Nov 2008 17:50:58 -0000	1.13
@@ -136,6 +136,7 @@
 # - kolab_smtpdpolicy_conffile_usr=kolab
 # - kolab_smtpdpolicy_conffile_grp=filter
 
+syslog_facility=user
 kolab_statedir=${localstatedir}/lib/kolab
 kolab_logdir=${localstatedir}/log/kolab
 kolab_pidfile=${sysrundir}/kolab.pid
@@ -159,6 +160,7 @@
 #--------------------------------------------------------------------
 # TODO: is ldapserver_rundir still used?
 
+directory_mode=slurpd
 ldapserver_statedir=${localstatedir}/lib/ldap
 ldapserver_dir=${localstatedir}/lib/ldap
 ldapserver_replogfile=${localstatedir}/lib/ldap/replog

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- common	8 Nov 2008 09:54:03 -0000	1.49
+++ common	18 Nov 2008 17:50:58 -0000	1.50
@@ -22,6 +22,8 @@
 	-e 's,[@]VERSION[@],$(VERSION),g' \
 	-e 's,[@]WITHOPENPKG[@],$(WITHOPENPKG),g' \
 	-e 's,[@]aliases_file[@],$(aliases_file),g' \
+	-e 's,[@]syslog_facility[@],$(syslog_facility),g' \
+	-e 's,[@]directory_mode[@],$(directory_mode),g' \
 	-e 's,[@]amavisd_conffile[@],$(amavisd_conffile),g' \
 	-e 's,[@]amavisd_grp[@],$(amavisd_grp),g' \
 	-e 's,[@]amavisd_home[@],$(amavisd_home),g' \

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- debian	27 Oct 2008 16:12:29 -0000	1.19
+++ debian	18 Nov 2008 17:50:58 -0000	1.20
@@ -76,7 +76,7 @@
 imap_lmtp=${localstatedir}/run/cyrus/socket/lmtp
 imap_notify_socket=${localstatedir}/run/cyrus/socket/notify
 
-
+syslog_facility=local5
 kolab_statedir=${localstatedir}/lib/kolab
 kolab_logdir=${localstatedir}/log/kolab
 kolab_pidfile=${sysrundir}/kolab.pid
@@ -91,6 +91,7 @@
 # Kolab web user interface
 kolab_wui=/admin
 
+directory_mode=syncrepl
 ldapserver_statedir=${localstatedir}/lib/ldap
 ldapserver_dir=${localstatedir}/lib/ldap
 ldapserver_replogfile=${ldapserver_statedir}/replog

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- kolab	12 Nov 2008 17:07:19 -0000	1.64
+++ kolab	18 Nov 2008 17:50:58 -0000	1.65
@@ -92,7 +92,7 @@
 imap_notify_socket=${imap_statedir}/socket/notify
 imap_pkg=imapd
 
-
+syslog_facility=user
 kolab_statedir=${localstatedir}/kolab
 kolab_logdir=${kolab_statedir}/log
 kolab_pidfile=${kolab_statedir}/kolab.pid
@@ -118,6 +118,7 @@
 # Kolab web user interface
 kolab_wui=/admin
 
+directory_mode=slurpd
 ldapserver_statedir=${localstatedir}/openldap
 ldapserver_dir=${ldapserver_statedir}/openldap-data
 ldapserver_replogfile=${ldapserver_statedir}/replog

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mandriva	19 Mar 2008 21:43:15 -0000	1.12
+++ mandriva	18 Nov 2008 17:50:58 -0000	1.13
@@ -35,6 +35,7 @@
 emailserver_grp=${restricted_kolab_grp}
 emailserver_mail_usr=kolab              # = kolab
 
+syslog_facility=user
 kolab_logdir=/var/log/kolab
 kolab_pidfile=/var/run/kolab/kolab.pid
 kolab_scriptsdir=$(sysconfdir)/kolab
@@ -42,6 +43,7 @@
 # Kolab web user interface
 kolab_wui=/admin
 
+directory_mode=slurpd
 ldapserver_dir=${localstatedir}/ldap-kolab
 ldapserver_rundir=/var/run/ldap
 ldapserver_schemadir=${datadir}/openldap/schema

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- suse	3 Jul 2008 20:00:07 -0000	1.79
+++ suse	18 Nov 2008 17:50:58 -0000	1.80
@@ -80,6 +80,7 @@
 imap_notify_socket=${imap_statedir}/socket/notify
 imap_pkg=cyrus-imapd-kolab
 
+syslog_facility=user
 kolab_statedir=${localstatedir}/lib/kolab
 kolab_logdir=${localstatedir}/log
 kolab_pidfile=${sysrundir}/kolab.pid
@@ -106,6 +107,7 @@
 # Kolab web user interface
 kolab_wui=/kolab
 
+directory_mode=slurpd
 ldapserver_statedir=${localstatedir}/lib/ldap
 ldapserver_dir=${localstatedir}/lib/ldap
 ldapserver_replogfile=${sysrundir}/slapd/replog