SOURCES (DEVEL): lms.init - HEAD->DEVEL

[dzeus]

Author: dzeus                        Date: Sun Nov  6 22:48:01 2005 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- HEAD->DEVEL

---- Files affected:
SOURCES:
   lms.init (1.1.2.5 -> 1.1.2.6) 

---- Diffs:

================================================================
Index: SOURCES/lms.init
diff -u SOURCES/lms.init:1.1.2.5 SOURCES/lms.init:1.1.2.6
--- SOURCES/lms.init:1.1.2.5	Tue Oct 26 22:08:48 2004
+++ SOURCES/lms.init	Sun Nov  6 23:47:55 2005
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# Startup script for LMS (almsd)
+# Startup script for LMS (lmsd)
 #
 # Adam Nowotny <domelu at pld-linux.org>
 #
 # chkconfig:	2345 90 15
-# description:	almsd daemon for LMS
-# processname:	almsd
-# config:	/etc/sysconfig/almsd
+# description:	lmsd daemon for LMS
+# processname:	lmsd
+# config:	/etc/sysconfig/lms
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -16,40 +16,53 @@
 . /etc/sysconfig/network
 
 # Get service config
-[ -f /etc/sysconfig/almsd ] && . /etc/sysconfig/almsd
+[ -f /etc/sysconfig/lms ] && . /etc/sysconfig/lms
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-		msg_network_down almsd
+		msg_network_down lmsd
 		exit 1
 	fi
 else
 	exit 0
 fi
 
-[ -z "$ALMSD_DATABASE_TYPE" ] && ALMSD_DATABASE_TYPE="mysql"
+[ -z "$LMSD_DATABASE_TYPE" ] && LMSD_DATABASE_TYPE="mysql"
+[ -z "$LMSD_DATABASE_PASSWORD" ] && LMSD_DATABASE_PASSWORD=""
+[ -z "$LMSD_DATABASE_NAME" ] && LMSD_DATABASE_NAME="lms"
+[ -z "$LMSD_DATABASE_USER" ] && LMSD_DATABASE_USER="lms"
+[ -z "$LMSD_DATABASE_PORT" ] && LMSD_DATABASE_PORT=""
+[ -z "$LMSD_DATABASE_HOST" ] && LMSD_DATABASE_HOST="localhost"
+[ -z "$LMSD_OPTIONS" ] && LMSD_OPTIONS=""
 
 RETVAL=0
 case "$1" in
   start)
-	if [ ! -f /var/lock/subsys/almsd ]; then
-		msg_starting almsd
-		daemon almsd-$ALMSD_DATABASE_TYPE -b </dev/null
+	if [ ! -f /var/lock/subsys/lmsd ]; then
+		msg_starting lmsd
+
+		export LMSDBPASS="$LMSD_DATABASE_PASSWORD"
+		export LMSDBNAME="$LMSD_DATABASE_NAME"
+		export LMSDBUSER="$LMSD_DATABASE_USER"
+		export LMSDBPORT="$LMSD_DATABASE_PORT"
+		export LMSDBHOST="$LMSD_DATABASE_HOST"
+
+		daemon lmsd-$LMSD_DATABASE_TYPE $LMSD_OPTIONS
 		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/almsd
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/lmsd
 	else
-		msg_already_running almsd
+		msg_already_running lmsd
 	fi
 	;;
   stop)
-	if [ -f /var/lock/subsys/almsd ]; then
-		msg_stopping almsd
-		killproc almsd-$ALMSD_DATABASE_TYPE
+	if [ -f /var/lock/subsys/lmsd ]; then
+		msg_stopping lmsd
+		killproc lmsd-$LMSD_DATABASE_TYPE
 		sleep 1
-		rm -f /var/lock/subsys/almsd >/dev/null 2>&1
+		rm -f /var/lock/subsys/lmsd >/dev/null 2>&1
 	else
-		msg_not_running almsd
+		msg_not_running lmsd
 	fi
 	;;
   restart)
@@ -58,7 +71,7 @@
 	exit $?
 	;;
   status)
-	status almsd-$ALMSD_DATABASE_TYPE
+	status lmsd-$LMSD_DATABASE_TYPE
 	exit $?
 	;;			  
   *)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/lms.init?r1=1.1.2.5&r2=1.1.2.6&f=u