- add admin initscript

Changed files:
    dss-admin.init -> 1.1
    dss.spec -> 1.16

diff --git a/dss-admin.init b/dss-admin.init
new file mode 100644 (file)
index 0000000..41ae67e
--- /dev/null
+++ b/dss-admin.init
@@ -0,0 +1,94 @@
+#!/bin/sh
+#
+# streaming     Start/Stop MPEG-4 streaming server admin web interface
+#
+# chkconfig:    345 13 87
+#
+# description: Web admin interface for the MPEG-4 video and audio streaming server.
+#
+# processname: streamingadminserver
+# pidfile:
+#
+# $Id$
+
+# Source function library
+. /etc/rc.d/init.d/functions
+
+# Get network config
+. /etc/sysconfig/network
+
+# 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 "DSS Admin"
+               exit 1
+       fi
+else
+       exit 0
+fi
+
+start() {
+       # Check if the service is already running?
+       if [ -f /var/lock/subsys/dss-admin ]; then
+               msg_already_running "DSS Admin"
+               return
+       fi
+
+       msg_starting "DSS Admin"
+       daemon /usr/sbin/dss-admin
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dss-admin
+}
+
+stop() {
+       if [ ! -f /var/lock/subsys/dss-admin ]; then
+               msg_not_running "DSS Admin"
+               return
+       fi
+
+       # Stop daemons.
+       msg_stopping "DSS Admin"
+       killproc --pidfile /var/run/dss-admin.pid streamingadminserver -TERM
+       rm -f /var/lock/subsys/dss-admin
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/dss-admin ]; then
+               msg_not_running "DSS Admin"
+               RETVAL=$1
+               return
+       fi
+
+       stop
+       start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
+       ;;
+  restart)
+       stop
+       start
+       ;;
+  try-restart)
+       condrestart 0
+       ;;
+  force-reload)
+       condrestart 7
+       ;;
+  status)
+       status --pidfile /var/run/dss-admin.pid streamingadminserver
+       RETVAL=$?
+       ;;
+  *)
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
+       exit 3
+esac
+
+exit $RETVAL

diff --git a/dss.spec b/dss.spec
index 93f36f608e19b3098f01dd700f6b2f7eb2d4d9c1..61a7fe942b9914b8827a1c7530111061c924dfe0 100644 (file)
--- a/dss.spec
+++ b/dss.spec
@@ -5,13 +5,14 @@
 Summary:       Darwin Streaming Server
 Name:          dss
 Version:       6.0.3
-Release:       0.11
+Release:       0.12
 License:       Apple Public Source License
 Group:         Networking/Daemons
 Source0:       http://dss.macosforge.org/downloads/DarwinStreamingSrvr%{version}-Source.tar
 # Source0-md5: ca676691db8417d05121699c0ca3d549
 Source1:       %{name}.init
-Source2:       README.utils
+Source2:       %{name}-admin.init
+Source3:       README.utils
 Patch0:                %{name}.patch
 Patch1:                %{name}-x86_64.patch
 Patch2:                optflags.patch
@@ -100,7 +101,7 @@ Przykładowe pliki do Darwin Streaming Servera.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-cp -p %{SOURCE2} .
+cp -p %{SOURCE3} .
 
 # patch streamingadminserver.pl
 %{__sed} -i.bak -e  '
@@ -155,6 +156,7 @@ install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/lib/%{name},%{_mandir}/man{1,8}
        $RPM_BUILD_ROOT
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}-admin
 
 # avoid extension
 mv $RPM_BUILD_ROOT%{_sbindir}/streamingadminserver{.pl,}
@@ -214,7 +216,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add %{name}
+/sbin/chkconfig --add %{name}-admin
 %service %{name} restart
+%service %{name}-admin restart
 
 if [ "$1" = "1" ]; then
        %banner %{name} -e <<-EOF
@@ -229,7 +233,9 @@ fi
 %preun
 if [ "$1" = "0" ]; then
        %service -q %{name} stop
+       %service -q %{name}-admin stop
        /sbin/chkconfig --del %{name}
+       /sbin/chkconfig --del %{name}-admin
 fi
 
 %postun
@@ -266,6 +272,7 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/streamingadminserver.pem
 
 %attr(754,root,root) /etc/rc.d/init.d/dss
+%attr(754,root,root) /etc/rc.d/init.d/dss-admin
 %attr(755,root,root) %{_bindir}/MP3Broadcaster
 %attr(755,root,root) %{_bindir}/PlaylistBroadcaster
 %attr(755,root,root) %{_bindir}/StreamingLoadTool