steffen: server/kolabd rc.kolabd, NONE, 1.1 Makefile, 1.2, 1.3 kolabd.spec, 1.5, 1.6 rc.kolab, 1.1.1.1, NONE

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	Makefile kolabd.spec 
Added Files:
	rc.kolabd 
Removed Files:
	rc.kolab 
Log Message:
rename rc.kolab ro rc.kolabd and hash password created by bootstrap

--- NEW FILE: rc.kolabd ---
#!@l_prefix@/lib/openpkg/bash @l_prefix@/etc/rc
##
##  rc.kolabd -- Run-Commands
##

%config
    kolabd_enable="$openpkg_rc_def"

%common
    kolabd_pidfile="@l_prefix@/var/kolab/kolab.pid"
    kolabd_signal () {
        [ -f $kolabd_pidfile ] && kill -$1 `cat $kolabd_pidfile`
    }

%status -u root -o
    kolabd_usable="unknown"
    kolabd_active="no"
    rcService kolabd enable yes && \
        kolabd_signal 0 && kolabd_active="yes"
    echo "kolabd_enable=\"$kolabd_enable\""
    echo "kolabd_usable=\"$kolabd_usable\""
    echo "kolabd_active=\"$kolabd_active\""

%start -p 600 -u @l_susr@
    rcService kolabd enable yes || exit 0
    rcService kolabd active yes && exit 0
    @l_prefix@@kolab_daemon@ &
    sleep 5

%stop -p 600 -u @l_susr@
    rcService kolabd enable yes || exit 0
    rcService kolabd active no  && exit 0
    kolabd_signal TERM
    sleep 5

%restart -u @l_susr@
    rcService kolabd enable yes || exit 0
    rcService kolabd active no  && exit 0
    rc kolabd stop start

%reload -u @l_susr@
    rcService kolabd enable yes || exit 0
    rcService kolabd active no  && exit 0
    kolabd_signal HUP
    sleep 5


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolabd/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	23 Nov 2004 20:36:04 -0000	1.2
+++ Makefile	13 Dec 2004 22:35:06 -0000	1.3
@@ -1,5 +1,5 @@
 RPM = /kolab/bin/openpkg rpm
-VERSION = 1.9.3
+VERSION = 1.9.4
 
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
@@ -8,7 +8,7 @@
 all:
 	test -d $(KOLABRPMSRC)/kolabd || mkdir $(KOLABRPMSRC)/kolabd
 	cd kolabd && tar -cvz --exclude=CVS --exclude=\*~ -f $(KOLABRPMSRC)/kolabd/kolabd-$(VERSION).tar.gz * 
-	cp rc.kolab kolabd.spec $(KOLABRPMSRC)/kolabd/
+	cp rc.kolabd kolabd.spec $(KOLABRPMSRC)/kolabd/
 	cd $(KOLABRPMSRC)/kolabd && $(RPM) -ba kolabd.spec
 binary:
 	$(RPM) -bB kolabd.spec

Index: kolabd.spec
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolabd.spec	12 Dec 2004 23:00:46 -0000	1.5
+++ kolabd.spec	13 Dec 2004 22:35:06 -0000	1.6
@@ -26,7 +26,7 @@
 
 #   package version
 %define       V_ei_maj 1.9
-%define       V_ei_min 3
+%define       V_ei_min 4
 %define       V_cf     1.0.4
 
 #   package information
@@ -39,15 +39,15 @@
 Class:        PLUS
 Group:        Mail
 License:      GPL
-Version:      1.9.3
-Release:      20041204
+Version:      1.9.4
+Release:      20041212
 
 #   package options
 %option       with_genuine   no
 
 #   list of sources
-Source0:      kolabd-1.9.3.tar.gz
-Source1:      rc.kolab
+Source0:      kolabd-1.9.4.tar.gz
+Source1:      rc.kolabd
 
 #   build information
 Prefix:       %{l_prefix}
@@ -102,7 +102,9 @@
         $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 \
-        $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/freebusy
+        $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/freebusy \
+        $RPM_BUILD_ROOT%{l_prefix}/sbin \
+        $RPM_BUILD_ROOT%{l_prefix}/bin
 
     %{l_shtool} mkdir -p -m 777 \
         $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/locks
@@ -139,9 +141,7 @@
 %if "%{with_genuine}" == "no"
     %{l_shtool} mkdir -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/schema \
-        $RPM_BUILD_ROOT%{l_prefix}/libexec/kolab \
-        $RPM_BUILD_ROOT%{l_prefix}/sbin \
-        $RPM_BUILD_ROOT%{l_prefix}/bin
+        $RPM_BUILD_ROOT%{l_prefix}/libexec/kolab
 
     %{l_shtool} install -c -m 744 %{l_value -s -a} \
         namespace/kolab \
@@ -181,11 +181,11 @@
 %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/
+        %{SOURCE rc.kolabd} $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/
+        %{SOURCE rc.kolabd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 %endif
 
     #   generate file list
@@ -205,8 +205,8 @@
     %{l_shtool} echo -e "Installing crontab entry"
     %{l_shtool} echo -e "`%{l_prefix}/bin/crontab -u %{l_musr} -l | grep -v %{l_prefix}/etc/kolab/kolabquotawarn`" \
 	'
-*/10 * * * * %{l_prefix}/etc/kolab/kolabquotawarn' | %{l_prefix}/bin/crontab -u %{l_musr} - 
+*/10 * * * * %{l_prefix}/etc/kolab/kolabquotawarn' | %{l_prefix}/bin/crontab - -u %{l_musr}
 
     echo "For a fresh install please initialize Kolab by running '$RPM_INSTALL_PREFIX/etc/kolab/kolab_bootstrap -b' as user root."
     echo "If you upgraded from a previous version simply refresh Kolab by running run '$RPM_INSTALL_PREFIX/sbin/kolabconf' as user root."
-    echo "In every case execute '$RPM_INSTALL_PREFIX/bin/openpkg rc kolab restart' as user root."
+    echo "In every case execute '$RPM_INSTALL_PREFIX/bin/openpkg rc kolabd restart' as user root."

--- rc.kolab DELETED ---