summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kolabd/Makefile.am3
-rw-r--r--kolabd/kolabd.sysvinit32
-rw-r--r--saslauthd/kolab-saslauthd.sysvinit3
3 files changed, 21 insertions, 17 deletions
diff --git a/kolabd/Makefile.am b/kolabd/Makefile.am
index 2154b86..95cd792 100644
--- a/kolabd/Makefile.am
+++ b/kolabd/Makefile.am
@@ -6,4 +6,5 @@ kolabddir = $(pythondir)/kolabd
kolabd_PYTHON = $(wildcard *.py)
install-exec-local:
- mkdir -p $(DESTDIR)/$(sbindir)
+ mkdir -p $(DESTDIR)/$(sbindir) \
+ $(DESTDIR)/$(localstatedir)/run/kolabd
diff --git a/kolabd/kolabd.sysvinit b/kolabd/kolabd.sysvinit
index 01e05e5..daa067a 100644
--- a/kolabd/kolabd.sysvinit
+++ b/kolabd/kolabd.sysvinit
@@ -1,39 +1,41 @@
#! /bin/bash
#
-# kolab-saslauthd Start/Stop the SASL authentication daemon
+# kolabd Start/Stop the Kolab server daemon
#
# chkconfig: - 65 10
-# description: The Kolab saslauthd is a server process which handles \
-# authentication requests on behalf of the cyrus-sasl library.
-# processname: kolab-saslauthd
+# description: The Kolab server is a server process which synchronizes
+# LDAP, SQL and other authentication databases with Cyrus IMAP,
+# Dovecot or other IMAP servers.
+# processname: kolabd
### BEGIN INIT INFO
-# Provides: kolab-saslauthd
+# Provides: kolabd
# Required-Start: $local_fs $network
# Required-Stop: $local_fs $network
-# Short-Description: Start/Stop the Kolab SASL authentication daemon
-# Description: The Kolab saslauthd is a server process which handles \
-# authentication requests on behalf of the cyrus-sasl library.
+# Short-Description: Start/Stop the Kolab Server daemon
+# Description: The Kolab server is a server process which synchronizes
+# LDAP, SQL and other authentication databases with Cyrus IMAP,
+# Dovecot or other IMAP servers.
### END INIT INFO
# Source function library.
. /etc/init.d/functions
# Source our configuration file for these variables.
-SOCKETDIR=/var/run/saslauthd
-FLAGS=
-if [ -f /etc/sysconfig/kolab-saslauthd ] ; then
- . /etc/sysconfig/kolab-saslauthd
+FLAGS="--fork -l warning"
+
+if [ -f /etc/sysconfig/kolabd ] ; then
+ . /etc/sysconfig/kolabd
fi
RETVAL=0
# Set up some common variables before we launch into what might be
# considered boilerplate by now.
-prog=kolab-saslauthd
-path=/usr/sbin/kolab-saslauthd
+prog=kolabd
+path=/usr/sbin/kolabd
lockfile=/var/lock/subsys/$prog
-pidfile=/var/run/kolab-saslauthd/kolab-saslauthd.pid
+pidfile=/var/run/kolabd/kolabd.pid
start() {
[ -x $path ] || exit 5
diff --git a/saslauthd/kolab-saslauthd.sysvinit b/saslauthd/kolab-saslauthd.sysvinit
index e529e9a..a72eab9 100644
--- a/saslauthd/kolab-saslauthd.sysvinit
+++ b/saslauthd/kolab-saslauthd.sysvinit
@@ -21,7 +21,8 @@
# Source our configuration file for these variables.
SOCKETDIR=/var/run/saslauthd
-FLAGS=
+FLAGS="--fork -l warning"
+
if [ -f /etc/sysconfig/kolab-saslauthd ] ; then
. /etc/sysconfig/kolab-saslauthd
fi