- Updated to 1.6.1, fixed (Michał Kowalczuk)

Changed files:
    lms.init -> 1.3
    lms.spec -> 1.56
    lms.sysconfig -> 1.5

diff --git a/lms.init b/lms.init
index 5dbf166e3c0422690e514c462b7535b92e9b6366..74b3e9ecec843167e677c89f9979e2ba39b9b530 100644 (file)
--- a/lms.init
+++ b/lms.init
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# Startup script for LMS (almsd)
+# Startup script for LMS (lmsd)
 #
 # Adam Nowotny <domelu@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 @@ case "$1" in
        exit $?
        ;;
   status)
-       status almsd-$ALMSD_DATABASE_TYPE
+       status lmsd-$LMSD_DATABASE_TYPE
        exit $?
        ;;                        
   *)

diff --git a/lms.spec b/lms.spec
index e7c0d8e1f63065d4118f56f5d84516e1a334d5eb..ee46162c8ca38233020c593be5eb2561e39c87cd 100644 (file)
--- a/lms.spec
+++ b/lms.spec
@@ -1,33 +1,34 @@
+# TODO: test build on amd64 and sheck /usr/lib64 patch
 #
 # Conditional build:
-%bcond_without almsd           # without almsd daemon
+%bcond_without lmsd            # without lmsd daemon
 #
 # TODO:
 # - cosmetics (sort in %%files and %%install)
 # - contrib split
 %define                lmsver          1.6
-%define                lmssubver       0
+%define                lmssubver       1
 Summary:       LAN Managment System
 Summary(pl):   System Zarz±dzania Sieci± Lokaln±
 Name:          lms
 Version:       %{lmsver}.%{lmssubver}
-Release:       1
+Release:       0.1
 License:       GPL
 Vendor:                LMS Developers
 Group:         Networking/Utilities
 Source0:       http://lms.rulez.pl/download/%{lmsver}/%{name}-%{version}.tar.gz
-# Source0-md5: 942955f198c2d7f5b8b702ec60335729
+# Source0-md5: b9ace330b87a6253009a56358289821e
 Source1:       %{name}.conf
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Patch0:                %{name}-PLD.patch
 Patch1:                %{name}-amd64.patch
 URL:           http://lms.rulez.pl/
-%{?with_almsd:BuildRequires:   libgadu-devel}
-%{?with_almsd:BuildRequires:   mysql-devel}
-%{?with_almsd:BuildRequires:   postgresql-devel}
-%{?with_almsd:PreReq:          rc-scripts}
-%{?with_almsd:Requires(post,preun):    /sbin/chkconfig}
+%{?with_lmsd:BuildRequires:    libgadu-devel}
+%{?with_lmsd:BuildRequires:    mysql-devel}
+%{?with_lmsd:BuildRequires:    postgresql-devel}
+%{?with_lmsd:PreReq:           rc-scripts}
+%{?with_lmsd:Requires(post,preun):     /sbin/chkconfig}
 Requires:      php
 Requires:      php-gd
 Requires:      php-posix
@@ -124,17 +125,17 @@ Simple user interface.
 %description user -l pl
 Prosty interfejs u¿ytkownika.
 
-%package almsd
+%package lmsd
 Summary:       LAN Managment System - LMS system backend
 Summary(pl):   LAN Managment System - backend systemu LMS
 Group:         Networking/Utilities
 Requires:      %{name} = %{version}-%{release}
 
-%description almsd
+%description lmsd
 A program to manage the server by creating configuration files based
 upon LMS database and restarting selected services.
 
-%description almsd -l pl
+%description lmsd -l pl
 Program zarz±dzaj±cy serwerem poprzez tworzenie plików
 konfiguracyjnych na podstawie bazy danych LMS'a i restartowanie
 wybranych us³ug.
@@ -147,22 +148,20 @@ wybranych us
 %endif
 
 %build
-%if %{with almsd}
+%if %{with lmsd}
 
 cd daemon
 
 ./configure --with-mysql
 %{__make} \
-       CC='%{__cc}' CFLAGS='%{rpmcflags} -fPIC -DUSE_MYSQL -I../..'
-mv almsd almsd-mysql
-
-rm db.o
+       CC='%{__cc}' CFLAGS='%{rpmcflags} -fPIC -DUSE_MYSQL -DLMS_LIB_DIR=\"/usr/lib/lms/\" -I../..'
+mv lmsd lmsd-mysql
 
 ./configure --with-pgsql
-%{__make} almsd \
+%{__make} lmsd \
        CC='%{__cc}' \
-       CFLAGS='%{rpmcflags} -fPIC -DUSE_PGSQL -I../..'
-mv almsd almsd-pgsql
+       CFLAGS='%{rpmcflags} -fPIC -DUSE_PGSQL -DLMS_LIB_DIR=\"/usr/lib/lms/\" -I../..'
+mv lmsd lmsd-pgsql
 
 cd ..
 %endif
@@ -193,8 +192,8 @@ install contrib/sqlpanel/*.html $RPM_BUILD_ROOT%{_lmsdir}/templates
 cp -r contrib/customer/* $RPM_BUILD_ROOT%{_lmsdir}/www/user
 
 # daemon
-%if %{with almsd}
-install daemon/almsd-* $RPM_BUILD_ROOT%{_sbindir}
+%if %{with lmsd}
+install daemon/lmsd-* $RPM_BUILD_ROOT%{_sbindir}
 install daemon/modules/*/*.so $RPM_BUILD_ROOT/usr/lib/lms
 cp -r daemon/modules/dns/sample $RPM_BUILD_ROOT%{_sysconfdir}/modules/dns
 cp -r daemon/modules/ggnotify/sample $RPM_BUILD_ROOT%{_sysconfdir}/modules/ggnotify
@@ -219,12 +218,12 @@ elif [ -d /etc/httpd/httpd.conf ]; then
        fi
 fi
 
-%post almsd
+%post lmsd
 /sbin/chkconfig --add lmsd
 if [ -f /var/lock/subsys/lmsd ]; then
        /etc/rc.d/init.d/lmsd restart >&2
 else
-       echo "Run \"/etc/rc.d/init.d/lmsd start\" to start almsd daemon."
+       echo "Run \"/etc/rc.d/init.d/lmsd start\" to start lmsd daemon."
 fi
 
 %preun
@@ -242,7 +241,7 @@ if [ "$1" = "0" ]; then
        fi
 fi
 
-%preun almsd
+%preun lmsd
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/lmsd ]; then
                /etc/rc.d/init.d/lmsd stop >&2
@@ -301,11 +300,10 @@ echo
 %defattr(644,root,root,755)
 %{_lmsdir}/www/user
 
-%if %{with almsd}
-%files almsd
+%if %{with lmsd}
+%files lmsd
 %defattr(644,root,root,755)
-%doc daemon/lms.ini.sample
-%attr(755,root,root) %{_sbindir}/almsd-*
+%attr(755,root,root) %{_sbindir}/lmsd-*
 %attr(755,root,root) /usr/lib/lms/*.so
 %attr(754,root,root) /etc/rc.d/init.d/lmsd
 /etc/lms/modules/*

diff --git a/lms.sysconfig b/lms.sysconfig
index 274a5bd313f11cd2c0ce5daabaa92f83028af724..96fdd4aa261a6b08e7a6edb46a55d1b2db4a5fa5 100644 (file)
--- a/lms.sysconfig
+++ b/lms.sysconfig
@@ -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=""