Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > 4ed4a043b6654bcd35a79d6befc9d8ea > files > 1

darwinstreamingserver-6.0.3-2mdv2009.1.src.rpm

diff -Naur DSS-v5_0_3_2/ReleaseNotes.txt DSS-v5_0_3_2.oden/ReleaseNotes.txt
--- DSS-v5_0_3_2/ReleaseNotes.txt	2003-03-13 02:26:42.000000000 +0100
+++ DSS-v5_0_3_2.oden/ReleaseNotes.txt	2005-05-04 20:01:52.271342038 +0200
@@ -526,7 +526,7 @@
 		     qtpasswd 4.0 [v392] built on: Nov 19 2001, 10:20:52
 		     Usage: qtpasswd [-F] [-f filename] [-c] [-r realm] [-p password] [-d] username
 		     -F   Don't ask for confirmation when deleting users or overwriting existing files.
-		     -f   Password file to manipulate (Default is "/Library/QuickTimeStreaming/Config/qtusers").
+		     -f   Password file to manipulate (Default is "/etc/dss/qtusers").
 		     -c   Create new file.
 		     -r   The realm name to use when creating a new file via "-c" (Default is "Streaming Server").
 		     -p   Allows entry of password at command line rather than prompting for it.
diff -Naur DSS-v5_0_3_2/StreamingProxy.tproj/StreamingProxy.html DSS-v5_0_3_2.oden/StreamingProxy.tproj/StreamingProxy.html
--- DSS-v5_0_3_2/StreamingProxy.tproj/StreamingProxy.html	2001-03-16 00:18:04.000000000 +0100
+++ DSS-v5_0_3_2.oden/StreamingProxy.tproj/StreamingProxy.html	2005-05-04 20:01:52.272342061 +0200
@@ -81,13 +81,13 @@
 
 <OL>
    <LI>Install the Streaming Proxy in a reasonable place on your
-   machine (For example, /usr/local/sbin ).</LI>
+   machine (For example, /usr/sbin ).</LI>
    
    <LI>Edit the streamingproxy.conf file put place
-   it in the /etc/streaming/ directory.</LI>
+   it in the /etc/dss/ directory.</LI>
    
    <LI>Launch the StreamingProxy application (ie.
-  <CODE> #/usr/local/sbin/StreamingProxy -c /etc/streaming/streamingproxy.conf</CODE>)</LI>
+  <CODE> #/usr/sbin/StreamingProxy -c /etc/dss/streamingproxy.conf</CODE>)</LI>
    
     <LI>Launch the StreamingProxy application using the -h command line option for a description of the other
    command line options.</LI>
diff -Naur DSS-v5_0_3_2/StreamingProxy.tproj/streamingproxy.conf DSS-v5_0_3_2.oden/StreamingProxy.tproj/streamingproxy.conf
--- DSS-v5_0_3_2/StreamingProxy.tproj/streamingproxy.conf	2001-05-18 02:31:32.000000000 +0200
+++ DSS-v5_0_3_2.oden/StreamingProxy.tproj/streamingproxy.conf	2005-05-04 20:01:52.272342061 +0200
@@ -2,19 +2,23 @@
 # proxy configuration file
 #
 
+# NOTE!
+# for some reason TAB:s don't work in this file...
+# Regards // Oden Eriksson
+
 #
 # allow IP/bit-range        
 #        allows connections from the IP network masked by bit-range
 #        NOTE: lack of this line allows connections from any IP address
 #        It is best to limit incoming connections to your internal network.
 #
-# allow	 	10.0.0.0/8
+#allow 10.0.0.0/8
 
 #
 # users 	
 #        Specifies the maximum number of simultaneous users
 #
-users	150
+users 150
 
 #
 # listen <address> <port-num>
@@ -22,18 +26,18 @@
 #        if <address> is not specified, it listens on all addresses
 #
 #listen 127.0.0.1 5540
-listen	554
-listen	7070
+listen 554
+listen 7070
 
 #
 # port-range <from-to>
 #	 specifies the range of UDP ports that the proxy should use
 #
-port-range	10000-15000
+port-range 10000-15000
 
 #
 # rtp-bind-addr <address> 
 #   REQUIRED: Specify the proxy's ip address to bind to for the RTP sockets. 
 #	      This must be a valid host name or network IP address.
 #
-#rtp-bind-addr 5.6.7.8
+rtp-bind-addr 127.0.0.1
diff -Naur DSS-v5_0_3_2/WebAdmin/streamingadminserver.conf DSS-v5_0_3_2.oden/WebAdmin/streamingadminserver.conf
--- DSS-v5_0_3_2/WebAdmin/streamingadminserver.conf	2001-08-10 22:29:43.000000000 +0200
+++ DSS-v5_0_3_2.oden/WebAdmin/streamingadminserver.conf	2005-05-04 20:01:52.274342107 +0200
@@ -1,32 +1,35 @@
 # Sample config file for Streaming Admin Server
-# for QuickTime Streaming Server on MacOS X
 
 # Port on which the streaming admin server listens for requests
 port=1220
 
 # The root directory for all the html and cgi files
 # The path should be absolute
-root=/Library/QuickTimeStreaming/AdminHtml
+root=/var/lib/dss/AdminHtml
 
 # The root directory for play lists managed by the adminserver
 # The path should be absolute
-plroot=/Library/QuickTimeStreaming/Playlists
+plroot=/var/lib/dss/Playlists
+
+# NOTE! You must set "host" and "qtssIPAddress" to the same
+# values as the DarwinStreamingServer is listening to.
+# Regards // Oden Eriksson
 
 # The host name of the streaming admin server
-host=foo.bar.com
+host=
 
 # The ip address of the streaming server it has to administer
-qtssIPAddress=127.0.0.1
+qtssIPAddress=
 
 # The listening port of the streaming server it has to administer
 qtssPort=554
 
 # The name of the streaming server binary
-qtssName=/usr/sbin/QuickTimeStreamingServer
+qtssName=/usr/sbin/DarwinStreamingServer
 
 # If set to 1, admin server will start qtss when it is launched
 # If set to 0, qtss will not be launched when the admin starts up
-qtssAutoStart=1
+qtssAutoStart=0
 
 # To add new mime types
 # If the suffix is xxx, and the
@@ -41,7 +44,7 @@
 log=1
 
 # The full path of the streaming admin server log file
-logfile=/Library/QuickTimeStreaming/Logs/streamingadminserver.log
+logfile=/var/log/dss/StreamingAdminServer.log
 
 # Number of hours before which logs are rolled
 logtime=168
@@ -53,7 +56,5 @@
 # Movie's directory
 gbrowse=0
 
-
-
-
-
+# disable ssl per default
+ssl=0
diff -Naur DSS-v5_0_3_2/qtaccess DSS-v5_0_3_2.oden/qtaccess
--- DSS-v5_0_3_2/qtaccess	2001-11-03 00:44:44.000000000 +0100
+++ DSS-v5_0_3_2.oden/qtaccess	2005-05-04 20:01:52.271342038 +0200
@@ -22,19 +22,13 @@
 
 # AuthUserFile: The filename that contains the list of users
 # for this access file 
-# If not given, the default filename is /Library/QuickTimeStreaming/Config/qtusers for MacOSX
-# If not given, the default filename is /etc/streaming/qtusers for POSIX
 # usage: AuthUserFile <user filename>
-#AuthUserFile /etc/streaming/qtusers
-AuthUserFile /Library/QuickTimeStreaming/Config/qtusers
+AuthUserFile /etc/dss/qtusers
 
 # AuthGroupFile: The filename that contains the groups and the 
 # users that belong to each group
-# If not given, the default filename is /Library/QuickTimeStreaming/Config/qtgroups for MacOSX
-# If not given, the default filename is /etc/streaming/qtgroups for POSIX
 # usage: AuthGroupFile  <group filename>
-#AuthGroupFile  /etc/streaming/qtgroups
-AuthGroupFile /Library/QuickTimeStreaming/Config/qtgroups
+AuthGroupFile /etc/dss/qtgroups
 
 # require user: The names next to this specify which user 
 # is allowed to access the media in this folder
@@ -58,10 +52,11 @@
 # both. <Limit READ> can be omitted as the access keywords outside the
 # Limit directive
 # usage: <Limit [READ|WRITE] ..> ... </Limit>
+
 <Limit WRITE>
  AuthName "streaming server broadcaster realm"
- AuthUserFile /Library/QuickTimeStreaming/Config/qtbroadcastusers
- AuthGroupFile /Library/QuickTimeStreaming/Config/qtbroadcastgroups
+ AuthUserFile /etc/dss/qtbroadcastusers
+ AuthGroupFile /etc/dss/qtbroadcastgroups
  require group broadcaster
 </Limit>
 
diff -Naur DSS-v5_0_3_2/streamingserver.xml DSS-v5_0_3_2.oden/streamingserver.xml
--- DSS-v5_0_3_2/streamingserver.xml	2003-04-09 02:30:38.000000000 +0200
+++ DSS-v5_0_3_2.oden/streamingserver.xml	2005-05-04 20:01:52.273342084 +0200
@@ -79,16 +79,16 @@
 	<PREF NAME="error_logfile_interval" TYPE="UInt32">7</PREF>
 
 	<!-- error log. A value of 0 means unlimited. -->
-	<PREF NAME="error_logfile_dir">/Library/QuickTimeStreaming/Logs</PREF>
+	<PREF NAME="error_logfile_dir">/var/log/dss</PREF>
 
 	<!-- Name of the error log file. -->
 	<PREF NAME="error_logfile_name">Error</PREF>
 	
 	<!-- Path to the pid file. Mac OSX and Darwin unixes only. -->
-	<PREF NAME="pid_file">/var/run/QuickTimeStreamingServer.pid</PREF>
+	<PREF NAME="pid_file">/var/run/dss/DarwinStreamingServer.pid</PREF>
 	
 	<!-- Path to the folder containing dynamic loadable server modules -->
-	<PREF NAME="module_folder">/Library/QuickTimeStreaming/Modules</PREF>
+	<PREF NAME="module_folder">/usr/lib/dss</PREF>
 
 	<!-- If the server discovers it is serving more than its -->
 	<!-- allowed maximum bandwidth (using the average bandwidth computation) it -->
@@ -117,7 +117,7 @@
 	<PREF NAME="bind_ip_addr">0</PREF>
 
 	<!-- Path to the root folder for movies. -->
-	<PREF NAME="movie_folder">/Library/QuickTimeStreaming/Movies</PREF>
+	<PREF NAME="movie_folder">/var/lib/dss/Movies</PREF>
 
 	<!-- Maximum amount of bandwidth the server is allowed to serve. -->
 	<!-- value is in kilobits/sec. While this limit is exceeded, new client requests. -->
@@ -141,10 +141,10 @@
 	<PREF NAME="rtsp_timeout" TYPE="UInt32">0</PREF>
 
 	<!-- Run as this user -->
-	<PREF NAME="run_user_name"></PREF>
+	<PREF NAME="run_user_name">dss</PREF>
 
 	<!-- Member of this group -->
-	<PREF NAME="run_group_name"></PREF>
+	<PREF NAME="run_group_name">dss</PREF>
 
 	<!-- The following 8 prefs implement the server's thinning algorithm. -->
 	<!-- They are all in milliseconds -->
@@ -291,7 +291,7 @@
 	<PREF NAME="request_logfile_size" TYPE="UInt32">10240000</PREF>
 
 	<!-- Path to directory where access logs are stored. -->
-	<PREF NAME="request_logfile_dir">/Library/QuickTimeStreaming/Logs</PREF>
+	<PREF NAME="request_logfile_dir">/var/log/dss</PREF>
 
 	<!-- Name of the access log file. -->
 	<PREF NAME="request_logfile_name">StreamingServer</PREF>
@@ -362,7 +362,7 @@
     <PREF NAME="mp3_request_logfile_name" >mp3_access</PREF>
     
 	<!-- Path to directory where access logs are stored. -->
-	<PREF NAME="mp3_request_logfile_dir">/Library/QuickTimeStreaming/Logs</PREF>
+	<PREF NAME="mp3_request_logfile_dir">/var/log/dss</PREF>
 
 	<!-- Either "true" or "false". This toggles -->
 	<!-- mp3 access logging on and off. -->
@@ -394,14 +394,14 @@
 	<PREF NAME="http_xfer_enabled" TYPE="Bool16" >false</PREF>
 	<!-- Path to the http download folder. All files -->
 	<!-- that are requested from this folder are sent via HTTP -->
-	<PREF NAME="http_folder">/Library/QuickTimeStreaming/Movies/http</PREF>
+	<PREF NAME="http_folder">/var/lib/dss/Movies/http</PREF>
 	<!-- Either "true" or "false". This toggles http module -->
 	<!-- logging on and off. -->
 	<PREF NAME="http_logging" TYPE="Bool16">true</PREF>
 	<!-- Name of the http module log file. -->
 	<PREF NAME="http_logfile_name">Http</PREF>
 	<!-- Path to directory where http module logs are stored. -->
-	<PREF NAME="http_logfile_dir">/Library/QuickTimeStreaming/Logs</PREF>
+	<PREF NAME="http_logfile_dir">/var/log/dss</PREF>
 	<!-- Maximum allowed size in bytes for the http module log. A -->
 	<!-- value of 0 means unlimited. -->
 	<PREF NAME="http_logfile_size" TYPE="UInt32">256000</PREF>
@@ -516,7 +516,7 @@
 <MODULE NAME="QTSSRelayModule">
 	<!-- Relay preferences file. This file should be in the documented .rcf (Relay config file) -->
 	<!-- format. The Relay will use this to load up all relay streams -->
-	<PREF NAME="relay_prefs_file">/Library/QuickTimeStreaming/Config/relayconfig.xml</PREF>
+	<PREF NAME="relay_prefs_file">/etd/dss/relayconfig.xml</PREF>
 
 	<!-- enter this URL into a web browser and get a web page with current stats on -->
 	<!-- your active relays -->
@@ -528,10 +528,10 @@
 	<PREF NAME="modAccess_qtaccessfilename">qtaccess</PREF>
 
 	<!-- The default path and file name for the AccessModule's groups list -->
-	<PREF NAME="modAccess_groupsfilepath">/Library/QuickTimeStreaming/Config/qtgroups</PREF>
+	<PREF NAME="modAccess_groupsfilepath">/etc/dss/qtgroups</PREF>
 
 	<!-- The default path and file name for the AccessModule's user list -->
-	<PREF NAME="modAccess_usersfilepath">/Library/QuickTimeStreaming/Config/qtusers</PREF>
+	<PREF NAME="modAccess_usersfilepath">/etc/dss/qtusers</PREF>
 </MODULE>
 
 <MODULE NAME="QTSSAdminModule">
diff -Naur DSS-v5_0_3_2/streamingserver.xml-POSIX DSS-v5_0_3_2.oden/streamingserver.xml-POSIX
--- DSS-v5_0_3_2/streamingserver.xml-POSIX	2003-04-09 02:30:38.000000000 +0200
+++ DSS-v5_0_3_2.oden/streamingserver.xml-POSIX	2005-05-04 20:01:52.273342084 +0200
@@ -79,7 +79,7 @@
 	<PREF NAME="error_logfile_interval" TYPE="UInt32">7</PREF>
 
 	<!-- error log. A value of 0 means unlimited. -->
-	<PREF NAME="error_logfile_dir">/var/streaming/logs</PREF>
+	<PREF NAME="error_logfile_dir">/var/log/dss</PREF>
 
 	<!-- Name of the error log file. -->
 	<PREF NAME="error_logfile_name">Error</PREF>
@@ -88,7 +88,7 @@
     <PREF NAME="pid_file">/var/run/DarwinStreamingServer.pid</PREF>
 
 	<!-- Path to the folder containing dynamic loadable server modules -->
-	<PREF NAME="module_folder">/usr/local/sbin/StreamingServerModules</PREF>
+	<PREF NAME="module_folder">/usr/lib/dss</PREF>
 
 	<!-- If the server discovers it is serving more than its -->
 	<!-- allowed maximum bandwidth (using the average bandwidth computation) it -->
@@ -121,7 +121,7 @@
 	<PREF NAME="bind_ip_addr">0</PREF>
 
 	<!-- Path to the root folder for movies. -->
-	<PREF NAME="movie_folder">/usr/local/movies</PREF>
+	<PREF NAME="movie_folder">/var/lib/dss/Movies/</PREF>
 
 	<!-- Maximum amount of bandwidth the server is allowed to serve. -->
 	<!-- value is in kilobits/sec. While this limit is exceeded, new client requests. -->
@@ -293,7 +293,7 @@
 	<PREF NAME="request_logfile_size" TYPE="UInt32">10240000</PREF>
 
 	<!-- Path to directory where access logs are stored. -->
-	<PREF NAME="request_logfile_dir">/var/streaming/logs</PREF>
+	<PREF NAME="request_logfile_dir">/var/log/dss</PREF>
 
 	<!-- Name of the access log file. -->
 	<PREF NAME="request_logfile_name">StreamingServer</PREF>
@@ -364,7 +364,7 @@
     <PREF NAME="mp3_request_logfile_name" >mp3_access</PREF>
     
 	<!-- Path to directory where access logs are stored. -->
-	<PREF NAME="mp3_request_logfile_dir">/var/streaming/logs</PREF>
+	<PREF NAME="mp3_request_logfile_dir">/var/log/dss</PREF>
 
 	<!-- Either "true" or "false". This toggles -->
 	<!-- mp3 access logging on and off. -->
@@ -396,14 +396,14 @@
 	<PREF NAME="http_xfer_enabled" TYPE="Bool16" >false</PREF>
 	<!-- Path to the http download folder. All files -->
 	<!-- that are requested from this folder are sent via HTTP -->
-	<PREF NAME="http_folder">/usr/local/movies/http</PREF>
+	<PREF NAME="http_folder">/var/lib/dss/Movies/http</PREF>
 	<!-- Either "true" or "false". This toggles http module -->
 	<!-- logging on and off. -->
 	<PREF NAME="http_logging" TYPE="Bool16">true</PREF>
 	<!-- Name of the http module log file. -->
 	<PREF NAME="http_logfile_name">Http</PREF>
 	<!-- Path to directory where http module logs are stored. -->
-	<PREF NAME="http_logfile_dir">/var/streaming/logs</PREF>
+	<PREF NAME="http_logfile_dir">/var/log/dss</PREF>
 	<!-- Maximum allowed size in bytes for the http module log. A -->
 	<!-- value of 0 means unlimited. -->
 	<PREF NAME="http_logfile_size" TYPE="UInt32">256000</PREF>
@@ -518,7 +518,7 @@
 <MODULE NAME="QTSSRelayModule">
 	<!-- Relay preferences file. This file should be in the documented .rcf (Relay config file) -->
 	<!-- format. The Relay will use this to load up all relay streams -->
-	<PREF NAME="relay_prefs_file">/etc/streaming/relayconfig.xml</PREF>
+	<PREF NAME="relay_prefs_file">/etc/dss/relayconfig.xml</PREF>
 
 	<!-- enter this URL into a web browser and get a web page with current stats on -->
 	<!-- your active relays -->
@@ -530,10 +530,10 @@
 	<PREF NAME="modAccess_qtaccessfilename">qtaccess</PREF>
 
 	<!-- The default path and file name for the AccessModule's groups list -->
-	<PREF NAME="modAccess_groupsfilepath">/etc/streaming/qtgroups</PREF>
+	<PREF NAME="modAccess_groupsfilepath">/etc/dss/qtgroups</PREF>
 
 	<!-- The default path and file name for the AccessModule's user list -->
-	<PREF NAME="modAccess_usersfilepath">/etc/streaming/qtusers</PREF>
+	<PREF NAME="modAccess_usersfilepath">/etc/dss/qtusers</PREF>
 </MODULE>
 
 <MODULE NAME="QTSSAdminModule">