mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-10-19 18:18:12 +00:00
merge of '8598aa9f30108405c0f497eeedf0113568115c19'
and 'ccac1110e9fff9029a2485c4ba9345c4912b0c85' Monotone-Parent: 8598aa9f30108405c0f497eeedf0113568115c19 Monotone-Parent: ccac1110e9fff9029a2485c4ba9345c4912b0c85 Monotone-Revision: 23bc0dfd83428726c3d32139c369a2635bca5566 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-10-31T17:16:50 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
commit
8bc00a5cf2
2 files changed
+15
-8
No files matched your search
@@ -41,7 +41,7 @@ then
|
|||||||
. /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
|
. /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
REAL_DAEMON=$GNUSTEP_SYSTEM_ROOT/Tools/sogod-0.9
|
REAL_DAEMON=sogod-0.9
|
||||||
DAEMON=/usr/sbin/sogod
|
DAEMON=/usr/sbin/sogod
|
||||||
NAME=sogo
|
NAME=sogo
|
||||||
DESC="Scalable OpenGroupware.Org (Inverse edition)"
|
DESC="Scalable OpenGroupware.Org (Inverse edition)"
|
||||||
@@ -76,18 +76,16 @@ fi
|
|||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
start)
|
start)
|
||||||
echo -n $"Starting $DESC: "
|
echo $"Starting $DESC: "
|
||||||
for ((a=1; a <= PREFORK ; a++))
|
for ((a=1; a <= PREFORK ; a++))
|
||||||
do
|
do
|
||||||
daemon su - sogo -c "$DAEMON $a"
|
daemon --user=sogo $DAEMON $a
|
||||||
|
echo "$DAEMON $a"
|
||||||
done
|
done
|
||||||
# daemon --user sogo --pidfile $PIDFILE $DAEMON
|
|
||||||
echo "$NAME."
|
|
||||||
;;
|
;;
|
||||||
stop)
|
stop)
|
||||||
echo -n $"Stopping $DESC: "
|
echo -n $"Stopping $DESC: "
|
||||||
killproc `basename $REAL_DAEMON` && rm -f ${PIDFILE}*
|
killproc $REAL_DAEMON && rm -f ${PIDFILE}*
|
||||||
# killproc -p $PIDFILE $REAL_DAEMON && rm -f $PIDFILE
|
|
||||||
echo "$NAME."
|
echo "$NAME."
|
||||||
;;
|
;;
|
||||||
restart|force-reload)
|
restart|force-reload)
|
||||||
|
|||||||
@@ -25,6 +25,15 @@ PIDFILE=/var/run/sogo/sogod.$1
|
|||||||
|
|
||||||
. /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
|
. /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
|
||||||
|
|
||||||
|
if [ -f $GNUSTEP_USER_ROOT/Tools/sogod-0.9 ]; then
|
||||||
|
sogod="$GNUSTEP_USER_ROOT/Tools/sogod-0.9"
|
||||||
|
elif [ -f $GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9 ]; then
|
||||||
|
sogod="$GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9"
|
||||||
|
else
|
||||||
|
echo "Can't find sogod-0.9"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
echo $$ > $PIDFILE
|
echo $$ > $PIDFILE
|
||||||
|
|
||||||
startport=`defaults read sogod-0.9 WOPort`
|
startport=`defaults read sogod-0.9 WOPort`
|
||||||
@@ -36,4 +45,4 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
let "port=$startport + $1 - 1"
|
let "port=$startport + $1 - 1"
|
||||||
exec $GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9 -WOPort $port >& /var/log/sogo/sogod-$port.log
|
exec $sogod -WOPort $port >& /var/log/sogo/sogod-$port.log &
|
||||||
Reference in new issue
Block a user