diff options
| author | Mathieu Parent <math.parent@gmail.com> | 2009-03-27 15:28:31 (GMT) |
|---|---|---|
| committer | Mathieu Parent <math.parent@gmail.com> | 2009-03-27 15:28:31 (GMT) |
| commit | 9e5142799cf64d48f8c63f5ea3989018a27aa42c (patch) | |
| tree | b219ed156adc2087e17997337868f3fbc0fa33a8 | |
| parent | c3abbe7b222cb95598526352aa85f4a60f5c7235 (diff) | |
| download | kolab-conf-9e5142799cf64d48f8c63f5ea3989018a27aa42c.tar.gz | |
backport fixes from HEAD:
2009-03-17 Mathieu Parent <math.parent@gmail.com>
* dist_conf/debian: sync with dist_conf/kolab (resmgr_locksdir,
resmgr_localedir and LDAPD)
* dist_conf/kolabsrv.in: add debian flavour
| -rw-r--r-- | conf/dist/debian | 10 | ||||
| -rw-r--r-- | conf/dist/kolabsrv.in | 13 |
2 files changed, 19 insertions, 4 deletions
diff --git a/conf/dist/debian b/conf/dist/debian index 029fb9d..519d56a 100644 --- a/conf/dist/debian +++ b/conf/dist/debian @@ -17,6 +17,9 @@ kolab_susr=root restricted_kolab_usr=kolab restricted_kolab_grp=kolab +# Define the deamons that are executed with openpkg rc +LDAPD=slapd + kolab_rcdir=${sysconfdir}/init.d pkgdocdir=${datadir}/doc/kolab kolabconf_script=${sbindir}/kolabconf @@ -148,12 +151,13 @@ resmgr_confdir=${sysconfdir}/kolab/filter resmgr_conffile_usr=kolab resmgr_conffile_grp=root #resmgr_tmpdir= +resmgr_locksdir=${kolab_statedir}/filter/locks +resmgr_localedir=${libdir}/usr/share/php/data/Kolab_Filter/locale 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 +resmgr_log_name='cons,pid' fbview_logfile=${localstatedir}/log/fbview.log freebusy_logdir=${localstatedir}/log @@ -162,7 +166,7 @@ freebusy_cachedir=${kolab_statedir}/freebusy-cache freebusy_usr=root freebusy_grp=www-data freebusy_log_type=syslog -freebusy_log_name=cons, pid +freebusy_log_name='cons,pid' graveyard_uidcache=${kolab_statedir}/graveyard_uidcache.db graveyard_tscache=${kolab_statedir}/graveyard_tscache.db diff --git a/conf/dist/kolabsrv.in b/conf/dist/kolabsrv.in index 3a9bbb3..2b8b2d2 100644 --- a/conf/dist/kolabsrv.in +++ b/conf/dist/kolabsrv.in @@ -43,6 +43,17 @@ function getServiceName() { clamav) SERVICE="clamd" ;; *) SERVICE=$sname esac + elif [ -e /etc/debian_version ]; then + case $sname in + openldap) SERVICE="@LDAPD@" ;; + sasl) SERVICE="saslauthd" ;; + imapd) SERVICE="kolab-cyrus" ;; + amavisd) SERVICE="amavis" ;; + clamav) SERVICE="clamav-daemon" ;; + spamd) SERVICE="spamassassin" ;; + freshclam) SERVICE="clamav-freshclam" ;; + *) SERVICE=$sname + esac fi } @@ -54,7 +65,7 @@ PARAM=$3 # Use the service name as defined in the openpkg environment # Kolab installations on native distributions, should adap service names # with the function getServiceName -SERVICES="@LDAPD@ saslauthd spamd amavisd apache2 freshclam cyrus postfix" +SERVICES="@LDAPD@ saslauthd spamd amavisd apache2 freshclam imapd postfix" SERVICES="$SERVICES clamav kolabd" case $RC in |