Fix some substitution errors, and allow more flexibilty in rc daemon manipulation

dss/dss.spec

@@ -35,7 +35,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Video
 License:      APSL
 Version:      5.0
-Release:      20031126
+Release:      20031127
 
 #   list of sources
 Source0:      http://www.opensource.apple.com/projects/streaming/release/DarwinStreamingSrc%{version}.zip
@@ -45,8 +45,8 @@ Source1:      rc.dss
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20031117, perl, sed, infozip, make, gcc
+BuildPreReq:  OpenPKG, openpkg >= 20031127, perl, sed, infozip, make, gcc
-PreReq:       OpenPKG, openpkg >= 20031117, perl, perl-ssl
+PreReq:       OpenPKG, openpkg >= 20031127, perl, perl-ssl
 AutoReq:      no
 AutoReqProv:  no
 
@@ -77,7 +77,7 @@ AutoReqProv:  no
         -e 's;/var/streaming/AdminHtml;%{l_prefix}/var/dss/webadmin;g' \
         -e 's;/var/streaming/playlists/;%{l_prefix}/share/dss/playlists;g' \
         -e 's;"realm", "DSS Admin Server";"realm", "Streaming Admin Server";g' \
-        -e 's;/usr/local/sbin/DarwinStreamingServer;%{l_prefix}/sbin/DarwinStreamingServer -c %{l_prefix}/etc/dss/streamingadmin.conf;g' \
+        -e 's;/usr/local/sbin/DarwinStreamingServer;%{l_prefix}/sbin/DarwinStreamingServer;g' \
         -e 's;/var/streaming/logs/streamingadminserver.log;%{l_prefix}/var/dss/log/StreamingAdmin.log;g' \
         -e 's;/usr/local/bin/qtpasswd;%{l_prefix}/bin/qtpasswd;g' \
         -e 's;/usr/local/bin/PlaylistBroadcaster;%{l_prefix}/bin/PlaylistBroadcaster;g' \
@@ -115,7 +115,8 @@ AutoReqProv:  no
         -e 's;/Library/QuickTimeStreaming/Logs/streamingadminserver.log;%{l_prefix}/var/dss/log/StreamingAdmin.log;g' \
         -e 's;/Library/QuickTimeStreaming/AdminHtml;%{l_prefix}/var/dss/webadmin;g' \
         -e 's;/Library/QuickTimeStreaming/Playlists;%{l_prefix}/share/dss/playlists;g' \
-        -e 's;/usr/sbin/QuickTimeStreamingServer;%{l_prefix}/sbin/DarwinStreamingServer -c %{l_prefix}/etc/dss/streamingserver.xml;g' \
+        -e 's;/usr/sbin/QuickTimeStreamingServer;%{l_prefix}/sbin/DarwinStreamingServer;g' \
+        -e 's;streamingadminserver.conf;streamingadmin.conf;g' \
         WebAdmin/streamingadminserver.conf
     %{l_shtool} subst \
         -e 's;^#!/.*/perl;#! %{l_prefix}/bin/perl;' \

dss/rc.dss

@@ -11,23 +11,25 @@
     dss_daemon_pidfile="@l_prefix@/var/dss/dssdaemon.pid"
     dss_admin_pidfile="@l_prefix@/var/dss/dssadmin.pid"
     dss_signal () {
-        [ -f $dss_daemon_pidfile ] \
+        if [ ".$2" = ".daemon" ]; then
-        && kill -$1 `cat $dss_daemon_pidfile`
+            [ -f $dss_daemon_pidfile ] && kill -$1 `cat $dss_daemon_pidfile`
-        local rc=$?
+        elif [ ".$2" = ".admin" ]; then
-        if rcVarIsYes dss_admin; then
+            [ -f $dss_admin_pidfile ] && kill -$1 `cat $dss_admin_pidfile`
-            [ -f $dss_admin_pidfile ] \
+        else
-            && kill -$1 `cat $dss_admin_pidfile` \
+            [ -f $dss_daemon_pidfile ] && kill -$1 `cat $dss_daemon_pidfile`
-            && [ $rc -eq 0 ]
+            local rc=$?
-            rc=$?
+            [ -f $dss_admin_pidfile ] && kill -$1 `cat $dss_admin_pidfile` && [ $rc -eq 0 ]
+            [ $? -eq 0 ]
         fi
-        [ $rc -eq 0 ]
     }
 
 %status -u @l_susr@ -o
     dss_usable="unknown"
     dss_active="no"
     rcService dss enable yes && \
-        dss_signal 0 && dss_active="yes"
+        dss_signal 0 daemon && dss_active="yes"
+    rcService dss enable yes && \
+        dss_signal 0 admin && dss_active="yes"
     echo "dss_enable=\"$dss_enable\""
     echo "dss_usable=\"$dss_usable\""
     echo "dss_active=\"$dss_active\""
@@ -35,18 +37,18 @@
 %start -u @l_susr@
     rcService dss enable yes || exit 0
     rcService dss active yes && exit 0
-    @l_prefix@/sbin/DarwinStreamingServer >/dev/null 2>&1
+    @l_prefix@/sbin/DarwinStreamingServer
     if rcVarIsYes dss_admin; then
-        @l_prefix@/sbin/streamingadminserver \
+        rc dss startadmin
-            -c @l_prefix@/etc/dss/streamingadmin.conf \
-            >/dev/null 2>&1
     fi
 
 %stop -u @l_susr@
     rcService dss enable yes || exit 0
     rcService dss active no && exit 0
-    dss_signal TERM
+    dss_signal TERM daemon
-    rm -f $dss_admin_pidfile 2>/dev/null || true
+    if rcVarIsYes dss_admin; then
+        rc dss stopadmin
+    fi
 
 %restart -u @l_susr@
     rcService dss enable yes || exit 0
@@ -55,3 +57,17 @@
     sleep 2
     rc dss start
 
+%startadmin -u @l_musr@
+    rcService dss enable yes || exit 0
+    rcService dss active yes && exit 0
+    @l_prefix@/sbin/streamingadminserver
+
+%stopadmin -u @l_musr@
+    rcService dss enable yes || exit 0
+    rcService dss active no && exit 0
+    dss_signal TERM admin
+    rm -f $dss_admin_pidfile >/dev/null 2>&1 || true
+
+#   The %daily logfile rotation logic is handled by the DSS daemon itself.
+#   Modify the error_logfile_* variables in streamingserver.xml to adjust.
+