summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Parent <math.parent@gmail.com>2008-11-18 17:50:58 (GMT)
committerMathieu Parent <math.parent@gmail.com>2008-11-18 17:50:58 (GMT)
commita2882ad3e14101d31da59881f6f1e64c3880282b (patch)
treeb1c0a3a1d4b2fbb114064f03247afdf6930e2e5b
parentb4209d5be1907dc576b35ea0a3b98c9976602cba (diff)
downloadkolab-conf-a2882ad3e14101d31da59881f6f1e64c3880282b.tar.gz
kolab/issue2446 (Make the used syslog facility configureable (kolabd, kolabconf))
-rw-r--r--conf/dist/centos-clarkconnect2
-rw-r--r--conf/dist/common2
-rw-r--r--conf/dist/debian3
-rw-r--r--conf/dist/kolab3
-rw-r--r--conf/dist/mandriva2
-rw-r--r--conf/dist/suse2
-rw-r--r--conf/kolab.globals.in4
7 files changed, 14 insertions, 4 deletions
diff --git a/conf/dist/centos-clarkconnect b/conf/dist/centos-clarkconnect
index f5fe525..f3d3500 100644
--- a/conf/dist/centos-clarkconnect
+++ b/conf/dist/centos-clarkconnect
@@ -136,6 +136,7 @@ imap_pkg=cyrus-imapd
# - 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 @@ kolab_wui=/kolab/admin
#--------------------------------------------------------------------
# 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
diff --git a/conf/dist/common b/conf/dist/common
index 644f44e..3f220b6 100644
--- a/conf/dist/common
+++ b/conf/dist/common
@@ -22,6 +22,8 @@ do_subst = sed \
-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' \
diff --git a/conf/dist/debian b/conf/dist/debian
index 044a39a..90b3a25 100644
--- a/conf/dist/debian
+++ b/conf/dist/debian
@@ -76,7 +76,7 @@ imap_sievedir=${localstatedir}/spool/sieve
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 @@ smarty_compiledir=/var/cache/kolab-webadmin/templates
# 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
diff --git a/conf/dist/kolab b/conf/dist/kolab
index cda52e0..9253154 100644
--- a/conf/dist/kolab
+++ b/conf/dist/kolab
@@ -92,7 +92,7 @@ imap_lmtp=${imap_statedir}/lmtp
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 @@ pear_horde_pkg=PEAR-Net_IMAP PEAR-Net_SMTP PEAR-Net_URL PEAR-Mail_Mime PEAR-Log
# 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
diff --git a/conf/dist/mandriva b/conf/dist/mandriva
index 58c52e1..dbabed5 100644
--- a/conf/dist/mandriva
+++ b/conf/dist/mandriva
@@ -35,6 +35,7 @@ emailserver_usr=${kolab_usr}
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_scriptsdir=$(sysconfdir)/kolab
# 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
diff --git a/conf/dist/suse b/conf/dist/suse
index 2bcfd9d..b62f3f9 100644
--- a/conf/dist/suse
+++ b/conf/dist/suse
@@ -80,6 +80,7 @@ imap_lmtp=${imap_statedir}/lmtp
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 @@ smarty_compiledir=${phplibdir2}/${kolab_php_module_prefix}admin/templates_c
# 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
diff --git a/conf/kolab.globals.in b/conf/kolab.globals.in
index 87126db..6f91017 100644
--- a/conf/kolab.globals.in
+++ b/conf/kolab.globals.in
@@ -7,7 +7,7 @@ cyrus-imaps : TRUE
cyrus-pop3 : FALSE
cyrus-pop3s : TRUE
cyrus-sieve : TRUE
-directory_mode : slurpd
+directory_mode : @directory_mode@
gyard_deletion_period : 10080
ldap_uri : ldap://127.0.0.1:389
log_level : 2
@@ -55,7 +55,7 @@ local_addr : 127.0.0.1
bind_any : TRUE
bind_addr : 0.0.0.0
calendar_id : calendar
-syslog_facility : user
+syslog_facility : @syslog_facility@
backupfiles : @backupfiles@
backupdir : @backupdir@
sysconfdir : @sysconfdir@