bo: server/kolab kolab.spec,1.24,1.25 rc.kolab,1.5,1.6

cvs at intevation.de cvs at intevation.de
Wed Mar 31 16:03:58 CEST 2004


Author: bo

Update of /kolabrepository/server/kolab
In directory doto:/tmp/cvs-serv1956

Modified Files:
	kolab.spec rc.kolab 
Log Message:
Updating the rc script to OpenPKG 2.0

Index: kolab.spec
===================================================================
RCS file: /kolabrepository/server/kolab/kolab.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- kolab.spec	9 Jun 2003 12:53:42 -0000	1.24
+++ kolab.spec	31 Mar 2004 14:03:55 -0000	1.25
@@ -1,122 +1,174 @@
 ##
 ##  kolab.spec -- OpenPKG RPM Specification
-##  Copyright (c) 2002 Erfrakon
-##  Copyright (c) 2003 Martin Konold <martin.konold at erfrakon.de>
-##  Copyright (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+##  Copyright (c) 2004 Klaraelvdalens Datakonsult AB <http://www.klaralvdalens-datakonsult.se>
+##  Copyright (c) 2000-2004 The OpenPKG Project <http://www.openpkg.org/>
+##  Copyright (c) 2000-2004 Ralf S. Engelschall <rse at engelschall.com>
+##  Copyright (c) 2000-2004 Cable & Wireless <http://www.cw.com/>
+##
+##  Permission to use, copy, modify, and distribute this software for
+##  any purpose with or without fee is hereby granted, provided that
+##  the above copyright notice and this permission notice appear in all
+##  copies.
+##
+##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+##  SUCH DAMAGE.
+##
 
-%define       V_kolab   1.0
+#   package version
+%define       V_ei_maj 1.0
+%define       V_ei_min 8
+%define       V_ei_eng %{V_ei_maj}
+%define       V_ei_adm 1.0.14
+%define       V_cf     1.0.4
 
 #   package information
 Name:         kolab
 Summary:      Kolab Groupware Server
-URL:          http://ftp.kde.org/pub/kde/unstable/server/kolab/kolab-current
-Vendor:       Erfrakon http://www.erfrakon.de
-Packager:     The Kroupware Project
-Distribution: Kolab
-Group:        core
+URL:          http://kolab.kde.org/
+Vendor:       Erfrakon, Intevation, Code Fusion, Klaraelvdalens Datakonsult AB
+Packager:     Klaraelvdalens Datakonsult AB
+Distribution: OpenPKG
+Class:        PLUS
+Group:        Mail
 License:      GPL
-Version:      %{V_kolab}
-Release:      20030609
+Version:      20040319
+Release:      20040319
+
+#   package options
+%option       with_genuine   no
 
 #   list of sources
-Source0:      ftp://ftp.kde.org/pub/kde/unstable/server/kolab/kolab-current/kolab-%{version}.tar.gz
-Source1:      Makefile
-Source2:      rc.kolab
+Source0:      http://www.erfrakon.de/projects/kolab/download/kolab-server-%{V_ei_maj}/src/kolab-%{V_ei_eng}-%{V_ei_adm}.src.rpm
+Source1:      rc.kolab
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 1.1.0
-PreReq:       OpenPKG, openpkg >= 1.1.0, openldap, postfix, imapd, sasl, apache, proftpd, perl-ldap
+BuildPreReq:  OpenPKG, openpkg >= 20040216
+PreReq:       OpenPKG, openpkg >= 20040216, openldap >= 2.2.5-20040212, postfix, imapd, sasl, apache, proftpd, perl, perl-ldap
+PreReq:       sasl >= 2.1.15-20031122, sasl::with_ldap = yes, sasl::with_login = yes
+PreReq:       proftpd >= 1.2.9-20031031, proftpd::with_ldap = yes
+PreReq:       gdbm >= 1.8.3-20030213, gdbm::with_ndbm = yes
+PreReq:       postfix >= 2.0.16-20031028, postfix::with_ldap = yes, postfix::with_sasl = yes, postfix::with_ssl = yes
+PreReq:       imapd >= 2.2.3-20040202, imapd::with_group = yes
+PreReq:       apache >= 1.3.29-20031124, apache::with_gdbm_ndbm = yes, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_php_pear = yes, apache::with_mod_ssl = yes
+%if "%{with_genuine}" == "no"
+PreReq:       perl-kolab, perl-db
+PreReq:	      amavisd
+PreReq:	      clamav
+%endif
 AutoReq:      no
 AutoReqProv:  no
 
 %description
-    Kolab is the KDE Groupware Server that provides full groupware features
-    to either KDE kolab clients or Microsoft Outlook[tm] clients with the 
-    Bynari Insight Connector http://www.bynari.net. In addition it is
-    a robust and fleixle general imap mail server with LDAP addressbook 
-    and nice web gui.
+    Kolab is the KDE Groupware Server that provides full groupware
+    features to either KDE kolab clients or Microsoft Outlook[tm]
+    clients using third party plugins. In addition it is a robust
+    and flexible general IMAP mail server with LDAP addressbooks.
+    Kolab %{V_ei_maj}.%{V_ei_min}, Engine %{V_ei_eng}, Admin %{V_ei_adm}
+
+    The Code Fusion fork adds functionality such as integration with
+    Active Directory, a more modularised backend, separation of the
+    daemon and the configuration generator and more.
+    Code Fusion Engine %{V_cf}, shares Admin (see above)
+
+%track
+    prog kolab-ei = {
+        version   = %{V_ei_eng}-%{V_ei_adm}
+        url       = http://www.erfrakon.de/projects/kolab/download/kolab-server-%{V_ei_maj}/src/
+        regex     = kolab-(__VER__)\.src\.rpm
+    }
 
 %prep
     %setup -q -c
+#    %{l_shtool} subst \
+#        -e "s;^\(# kolab_bootstrap Version .*\);\1, OpenPKG kolab-%{version}-%{release}, kolab-cf=%{V_cf};" \
+#        kolab_bootstrap
+#    %{l_shtool} subst \
+#        -e "s;\(>Version \).[^<]*<;\1cf-%{V_cf}<;" \
+#        admin/kolab/index.php
 
 %build
-    #echo "Finished"
 
 %install
     rm -rf $RPM_BUILD_ROOT
 
-    %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/kolab
-    %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-    %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/log
-    %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/cgi-bin
-    %{l_shtool} mkdir -p -m 777 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/freebusy
-    %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/icons
-    %{l_shtool} mkdir -p -m 777 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/locks
-
-    %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" %{SOURCE rc.kolab} \
-	$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+    %{l_shtool} mkdir -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/kolab \
+        $RPM_BUILD_ROOT%{l_prefix}/var/kolab/log \
+        $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/cgi-bin \
+        $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/icons
+    %{l_shtool} mkdir -p -m 777 \
+        $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/admin \
+        $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/freebusy \
+        $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/locks
 
-    # gets overwritten later
-    %{l_shtool} install -c -m 744 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' \
-	kolab_sslcert.sh $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 smtpd.conf.template virtual.template transport.template aliases.template \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' cyrus.conf.template \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/    
-    %{l_shtool} install -c -m 644 \
-    	-e 's;@@@kolab_prefix@@@;%{l_prefix};g' \
-	-e 's;@l_nusr@;%{l_nusr};g' \
-	-e 's;@l_ngrp@;%{l_ngrp};g' httpd.conf.template \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' legacy.conf.template \
+    %{l_shtool} install -c -m 744 %{l_value -s -a} \
+        kolab_sslcert.sh kolab kolab_bootstrap workaround.sh \
         $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' imapd.conf.template \
+
+    %{l_shtool} install -c -m 644 %{l_value -s -a} \
+        kolab.conf *.template \
         $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 imapd.group.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 744 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' kolab \
-	$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 kolab.conf $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 kolab.schema $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 744 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' \
-	-e "s;@@@l_musr@@@;%{l_musr};g" \
-        -e "s;@@@l_rgrp@@@;%{l_rgrp};g" kolab_bootstrap \
-	$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 \
-        -e 's;@@@kolab_prefix@@@;%{l_prefix};g' \
-        -e "s;@@@l_musr@@@;%{l_musr};g" \
-        -e "s;@@@l_rgrp@@@;%{l_rgrp};g" \
-        -e "s;@@@l_nusr@@@;%{l_nusr};g" main.cf.template \
- 	$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 master.cf.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    #%{l_shtool} install -c -m 644 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' monit.conf.template \
-#	$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 php.ini.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 \
-    	-e 's;@@@kolab_prefix@@@;%{l_prefix};g' \
-	-e 's;@@@l_nusr@@@;%{l_nusr};g' -e 's;@@@l_nuid@@@;%{l_nuid};g' \
-	-e 's;@@@l_ngrp@@@;%{l_ngrp};g' -e 's;@@@l_ngid@@@;%{l_ngid};g' proftpd.conf.template \
+
+%if "%{with_genuine}" == "no"
+    %{l_shtool} mkdir -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/schema \
+        $RPM_BUILD_ROOT%{l_prefix}/sbin
+
+    %{l_shtool} install -c -m 744 %{l_value -s -a} \
+        kolabd kolabconf \
+        $RPM_BUILD_ROOT%{l_prefix}/sbin/
+
+    %{l_shtool} install -c -m 644 %{l_value -s -a} \
+        kolab.globals \
         $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-#    %{l_shtool} install -c -m 644 proftpd.group.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-#    %{l_shtool} install -c -m 644 proftpd.passwd.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 saslauthd.conf.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 session_vars.php.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' slapd.conf.template \
+
+    %{l_shtool} install -c -m 644 %{l_value -s -a} \
+        kolab.schema kolab-cf.schema \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/schema/
+%else
+    %{l_shtool} install -c -m 644 %{l_value -s -a} \
+        kolab.schema \
         $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 744 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' workaround.sh \
-	$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/ 	
-    cp -r admin/ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/
-    
-    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
-    '%config %{l_prefix}/etc/kolab/*.pem' \
-    '%config %{l_prefix}/etc/kolab/*.schema' \
-    '%config %{l_prefix}/etc/kolab/kolab.conf'
+%endif
 
-%post
-    echo "Please run '%{l_prefix}/etc/kolab/kolab_bootstrap -b'"
+    cp -r admin/* $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/admin/
+
+    #   install run-command script
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
+%if "%{with_genuine}" == "no"
+    %{l_shtool} install -c -m 755 %{l_value -s -a} \
+        -e 's;@kolab_daemon@;/sbin/kolabd;' \
+        %{SOURCE rc.kolab} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+%else
+    %{l_shtool} install -c -m 755 %{l_value -s -a} \
+        -e 's;@kolab_daemon@;/etc/kolab/kolab;' \
+        %{SOURCE rc.kolab} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+%endif
+
+    #   generate file list
+    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
+        '%config %{l_prefix}/etc/kolab/*.pem' \
+        '%config %{l_prefix}/etc/kolab/*.schema' \
+        '%config %{l_prefix}/etc/kolab/kolab.conf'
 
 %files -f files
 
 %clean
     rm -rf $RPM_BUILD_ROOT
+
+%post
+    echo "please run '$RPM_INSTALL_PREFIX/etc/kolab/kolab_bootstrap -b'"
+

Index: rc.kolab
===================================================================
RCS file: /kolabrepository/server/kolab/rc.kolab,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rc.kolab	22 May 2003 18:49:51 -0000	1.5
+++ rc.kolab	31 Mar 2004 14:03:55 -0000	1.6
@@ -1,176 +1,46 @@
 #!@l_prefix@/lib/openpkg/bash @l_prefix@/etc/rc
 ##
-##  rc.kolab
+##  rc.kolab -- Run-Commands
 ##
-##  Copyright (c) 2002 Martin Konold <martin.konold at erfrakon.de>
-##  Copyright (c) 2002 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
 
 %config
-    kolab_enable="yes"
-
-%start -p 200 -u root
-    opServiceEnabled kolab || exit 0
-
-    echo "starting openldap ..."
-    if [ -f @l_prefix@/var/openldap/slapd.pid ]; then
-       PID=`cat @l_prefix@/var/openldap/slapd.pid | awk '{print $1}'`
-       SLAPDS=`ps -p $PID 2>/dev/null | grep -c slapd | awk '{print $1}'`
-       if [ $SLAPDS -gt 0 ]; then
-          echo "Warning: slapd is already running under pid $PID!"
-       else
-          @l_prefix@/libexec/slapd -f @l_prefix@/etc/openldap/slapd.conf
-          @l_prefix@/libexec/slurpd -f @l_prefix@/etc/openldap/slapd.conf
-       fi
-    else
-       @l_prefix@/libexec/slapd -f @l_prefix@/etc/openldap/slapd.conf
-       @l_prefix@/libexec/slurpd -f @l_prefix@/etc/openldap/slapd.conf
-    fi
-
-    echo "starting sasl ..."
-    if [ -f @l_prefix@/var/sasl/saslauthd/saslauthd.pid ]; then
-       PID=`cat @l_prefix@/var/sasl/saslauthd/saslauthd.pid | awk '{print $1}'`
-       SASLAUTHDS=`ps -p $PID 2>/dev/null | grep -c saslauthd | awk '{print $1}'`
-       if [ $SASLAUTHDS -gt 0 ]; then
-          echo "Warning: saslauthd is already running under pid $PID!"
-       else
-          rm -f @l_prefix@/var/sasl/saslauthd/saslauthd.pid
-          @l_prefix@/sbin/saslauthd -a ldap -n 5
-       fi
-    else
-       @l_prefix@/sbin/saslauthd -a ldap -n 5
-    fi
-
-    echo "starting cyrus imapd ..."
-    opServiceEnabled imapd || exit 0
-    if [ -f @l_prefix@/var/imapd/imapd.pid ]; then
-       PID=`cat @l_prefix@/var/imapd/imapd.pid | awk '{print $1}'`
-       IMAPDS=`ps -p $PID 2>/dev/null | grep -c cyrmaster | awk '{print $1}'`
-       if [ $IMAPDS -gt 0 ]; then
-          echo "Warning: cyrus imapd is already running under pid $PID!"
-       else
-          @l_prefix@/bin/cyrmaster -p @l_prefix@/var/imapd/imapd.pid -d
-       fi
-    else
-       @l_prefix@/bin/cyrmaster -p @l_prefix@/var/imapd/imapd.pid -d
-    fi
+    kolab_enable="$openpkg_rc_def"
 
-    echo "starting apache ..."
-    @l_prefix@/sbin/apachectl start
+%common
+    kolab_pidfile="@l_prefix@/var/kolab/kolab.pid"
+    kolab_signal () {
+        [ -f $kolab_pidfile ] && kill -$1 `cat $kolab_pidfile`
+    }
 
-    echo "starting postfix ..."
-    @l_prefix@/sbin/postfix start
+%status -u root -o
+    kolab_usable="unknown"
+    kolab_active="no"
+    rcService kolab enable yes && \
+        kolab_signal 0 && kolab_active="yes"
+    echo "kolab_enable=\"$kolab_enable\""
+    echo "kolab_usable=\"$kolab_usable\""
+    echo "kolab_active=\"$kolab_active\""
 
-    echo "starting kolab backend (please wait)"
+%start -p 600 -u @l_susr@
+    rcService kolab enable yes || exit 0
+    rcService kolab active yes && exit 0
+    @l_prefix@@kolab_daemon@ &
     sleep 5
-    if [ -f @l_prefix@/var at l_prefix@@l_prefix at .pid ]; then
-       PID=`cat @l_prefix@/var at l_prefix@@l_prefix at .pid | awk '{print $1}'`
-       KOLABS=`ps -p $PID 2>/dev/null | grep -c kolab | awk '{print $1}'`
-       if [ $KOLABS -gt 0 ]; then
-          echo "Warning: kolab is already running under pid $PID!"
-       else
-          @l_prefix@/etc at l_prefix@@l_prefix@ &
-       fi
-    else 
-       @l_prefix@/etc at l_prefix@@l_prefix@ &
-    fi
-
-%stop -p 200 -u root
-    opServiceEnabled kolab || exit 0
-
-    echo "stopping kolab backend ..."
-    if [ -f @l_prefix@/var at l_prefix@@l_prefix at .pid ]; then
-       kill `cat @l_prefix@/var at l_prefix@@l_prefix at .pid` 2>/dev/null
-    fi
-    sleep 1
-    killall -9 kolab 2>/dev/null
-
-    echo "stopping postfix ..."
-    @l_prefix@/sbin/postfix stop
 
-    echo "stopping apache ..."
-    @l_prefix@/sbin/apachectl stop
-
-    echo "stopping cyrus imapd ..."
-    if [ -f @l_prefix@/var/imapd/imapd.pid ]; then
-        kill -TERM `cat @l_prefix@/var/imapd/imapd.pid` 2>/dev/null
-        rm @l_prefix@/var/imapd/imapd.pid
-    fi
-    killall cyrmaster imapd pop3d timsievd lmtpd 2>/dev/null
-    sleep 2
-    killall -9 cyrmaster imapd pop3d timsievd lmtpd 2>/dev/null
-
-    echo "stopping saslauthd ..."
-    if [ -f @l_prefix@/var/sasl/saslauthd/saslauthd.pid ]; then
-        kill -TERM `cat @l_prefix@/var/sasl/saslauthd/saslauthd.pid` 2>/dev/null
-    fi
-    killall saslauthd 2>/dev/null
-    sleep 2
-    killall -9 saslauthd 2>/dev/null
-
-    echo "stopping openldap ..."
-    if [ -f @l_prefix@/var/openldap/slapd.pid ]; then
-      kill -INT `cat @l_prefix@/var/openldap/slapd.pid` 2>/dev/null
-    fi
-    killall -INT slapd 2>/dev/null
-    killall slurpd 2>/dev/null
-    sleep 1
-    killall -9 slurpd 2>/dev/null
-    killall -9 slapd 2>/dev/null
-
-    echo "stopping proftpd (if running) ..."
-    if [ -f @l_prefix@/var/proftpd/proftpd.pid ]; then
-        kill -TERM `cat @l_prefix@/var/proftpd/proftpd.pid` 2>/dev/null
-    fi
-    killall proftpd 2>/dev/null
-    sleep 1
-    killall -9 proftpd 2>/dev/null
-
-    exit 0
-
-%reload -u root
-    opServiceEnabled kolab || exit 0
-
-    echo "restart openldap (slapd cannot reload) ..."
-    killall -TERM slurpd 2>/dev/null
-    kill -INT `cat @l_prefix@/var/openldap/slapd.pid` 2>/dev/null
-    sleep 1
-    killall -9 slurpd 2>/dev/null
-    killall -9 slapd 2>/dev/null
-
-    @l_prefix@/libexec/slapd -f @l_prefix@/etc/openldap/slapd.conf
-    @l_prefix@/libexec/slurpd -f @l_prefix@/etc/openldap/slapd.conf
-
-    echo "restart saslauthd (saslauth cannot reload) ..."
-    if [ -f @l_prefix@/var/sasl/saslauthd/saslauthd.pid ]; then
-       kill -TERM `cat @l_prefix@/var/sasl/saslauthd/saslauthd.pid` 2>/dev/null
-    fi
-    sleep 1
-    killall -9 saslauthd 2>/dev/null
-    @l_prefix@/sbin/saslauthd -a ldap -n 5    
-
-    echo "reload cyrus imapd ..."
-    if [ -f @l_prefix@/var/imapd/imapd.pid ]; then
-      kill -HUP `cat @l_prefix@/var/imapd/imapd.pid` 2>/dev/null
-    fi
-
-    echo "reload postfix ..."
-    @l_prefix@/sbin/postfix reload
-
-    echo "reload apache ..."
-    @l_prefix@/sbin/apachectl restart
+%stop -p 600 -u @l_susr@
+    rcService kolab enable yes || exit 0
+    rcService kolab active no  && exit 0
+    kolab_signal TERM
+    sleep 5
 
-    echo "reload proftpd (if running) ..."
-    if [ -f @l_prefix@/var/proftpd/proftpd.pid ]; then
-      kill -HUP `cat @l_prefix@/var/proftpd/proftpd.pid` 2>/dev/null
-    fi 
+%restart -u @l_susr@
+    rcService kolab enable yes || exit 0
+    rcService kolab active no  && exit 0
+    rc kolab stop start
 
-    echo "reload kolab ..."
-    if [ -f @l_prefix@/var at l_prefix@@l_prefix at .pid ]; then
-      kill -HUP `cat @l_prefix@/var at l_prefix@@l_prefix at .pid` 2>/dev/null
-    fi 
+%reload -u @l_susr@
+    rcService kolab enable yes || exit 0
+    rcService kolab active no  && exit 0
+    kolab_signal HUP
+    sleep 5
 
-%restart -u root
-    opServiceEnabled kolab || exit 0
-    @l_prefix@/etc/rc.d/rc.kolab stop
-    sleep 1
-    @l_prefix@/etc/rc.d/rc.kolab start





More information about the commits mailing list