SOURCES: lms.init, lms.sysconfig - Updated to 1.6.1, fixed (MichaÅ...

japhy japhy at pld-linux.org
Tue Jul 19 00:31:02 CEST 2005


Author: japhy                        Date: Mon Jul 18 22:31:02 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- Updated to 1.6.1, fixed (Michał Kowalczuk)

---- Files affected:
SOURCES:
   lms.init (1.2 -> 1.3) , lms.sysconfig (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/lms.init
diff -u SOURCES/lms.init:1.2 SOURCES/lms.init:1.3
--- SOURCES/lms.init:1.2	Fri Oct 15 15:35:15 2004
+++ SOURCES/lms.init	Tue Jul 19 00:30:57 2005
@@ -1,12 +1,12 @@
 #!/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
+# description:	lmsd daemon for LMS
+# processname:	lmsd
 # config:	/etc/sysconfig/lms
 
 # Source function library.
@@ -21,35 +21,48 @@
 # 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
+	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 $?
 	;;			  
   *)

================================================================
Index: SOURCES/lms.sysconfig
diff -u SOURCES/lms.sysconfig:1.4 SOURCES/lms.sysconfig:1.5
--- SOURCES/lms.sysconfig:1.4	Fri Jun 24 15:55:33 2005
+++ SOURCES/lms.sysconfig	Tue Jul 19 00:30:57 2005
@@ -1,2 +1,20 @@
 # lmsd database type (mysql, pgsql or sqlite)
 # LMSD_DATABASE_TYPE="mysql"
+
+# lmsd database password 
+# LMSD_DATABASE_PASSWORD=""
+
+# lmsd database name (default: lms)
+# LMSD_DATABASE_NAME="lms"
+
+# lmsd database user (default: lms)
+# LMSD_DATABASE_USER="lms"
+
+# lmsd database port (default: empty)
+# LMSD_DATABASE_PORT=""
+
+# lmsd database host (default: localhost)
+# LMSD_DATABASE_HOST="localhost"
+
+# lmsd extra options
+# LMSD_OPTIONS=""
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/lms.init?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/lms.sysconfig?r1=1.4&r2=1.5&f=u




More information about the pld-cvs-commit mailing list