1.1 --- a/jabberd/rc.jabberd Fri Sep 21 22:44:32 2012 +0200 1.2 +++ b/jabberd/rc.jabberd Fri Sep 21 22:45:41 2012 +0200 1.3 @@ -16,12 +16,12 @@ 1.4 1.5 %common 1.6 jabberd_signal () { 1.7 - local retcode=0 1.8 + local retcode=1 1.9 local daemons= 1.10 for daemons in $jabberd_daemons; do 1.11 [ -f @l_prefix@/var/jabberd/pid/${daemons}.pid ] \ 1.12 - && kill -$1 `cat @l_prefix@/var/jabberd/pid/${daemons}.pid` 1.13 - retcode=$(($retcode+$?)) 1.14 + && kill -$1 `cat @l_prefix@/var/jabberd/pid/${daemons}.pid` \ 1.15 + && retcode=$? 1.16 done 1.17 return $retcode 1.18 } 1.19 @@ -56,7 +56,7 @@ 1.20 sleep 2 1.21 rc jabberd start 1.22 1.23 -%daily -u @l_susr@ 1.24 +%daily -u @l_nusr@ 1.25 rcService jabberd enable yes || exit 0 1.26 logfiles= 1.27 for daemons in $jabberd_daemons; do 1.28 @@ -64,7 +64,7 @@ 1.29 done 1.30 shtool rotate -f \ 1.31 -n ${jabberd_log_numfiles} -s ${jabberd_log_minsize} -d \ 1.32 - -z ${jabberd_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \ 1.33 + -z ${jabberd_log_complevel} -m 644 -o @l_nusr@ -g @l_ngrp@ \ 1.34 -P "${jabberd_log_prolog}" \ 1.35 -E "${jabberd_log_epilog}; rc jabberd restart" \ 1.36 $logfiles