Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 84011 | Differences between
and this patch

Collapse All | Expand All

(-)old/DSS-v5_0_3_2/WebAdmin/src/streamingadminserver.pl (-12 / +12 lines)
Lines 71-77 Link Here
71
        $defaultConfigPath = "/Library/QuickTimeStreaming/Config/streamingadminserver.conf";
71
        $defaultConfigPath = "/Library/QuickTimeStreaming/Config/streamingadminserver.conf";
72
}
72
}
73
else {
73
else {
74
	$defaultConfigPath = "/etc/streaming/streamingadminserver.conf";
74
	$defaultConfigPath = "/etc/dss/streamingadminserver.conf";
75
}
75
}
76
76
77
$debug = 0;
77
$debug = 0;
Lines 222-229 Link Here
222
else {
222
else {
223
	%vital = ("port", 1220,
223
	%vital = ("port", 1220,
224
	  "sslport", 1240,
224
	  "sslport", 1240,
225
	  "root", "/var/streaming/AdminHtml",
225
	  "root", "/var/lib/dss/admin",
226
      "plroot", "/var/streaming/playlists/",
226
      "plroot", "/var/lib/dss/media/playlists/",
227
	  "server", "DSS 4.1 Admin Server/1.0",
227
	  "server", "DSS 4.1 Admin Server/1.0",
228
	  "index_docs", "index.html parse_xml.cgi index.htm index.cgi",
228
	  "index_docs", "index.html parse_xml.cgi index.htm index.cgi",
229
	  "addtype_html", "text/html",
229
	  "addtype_html", "text/html",
Lines 238-265 Link Here
238
	  "realm", "DSS Admin Server",
238
	  "realm", "DSS Admin Server",
239
	  "qtssIPAddress", "localhost",
239
	  "qtssIPAddress", "localhost",
240
	  "qtssPort", "554",
240
	  "qtssPort", "554",
241
	  "qtssName", "/usr/local/sbin/DarwinStreamingServer",
241
	  "qtssName", "/usr/sbin/DarwinStreamingServer",
242
      "qtssAutoStart", "1",
242
      "qtssAutoStart", "1",
243
	  "logfile", "/var/streaming/logs/streamingadminserver.log",
243
	  "logfile", "/var/log/dss/streamingadminserver.log",
244
	  "log", "1",
244
	  "log", "1",
245
	  "logclear", "0",
245
	  "logclear", "0",
246
	  "logtime", "168",
246
	  "logtime", "168",
247
	  "messagesfile", "messages",
247
	  "messagesfile", "messages",
248
	  "gbrowse", "0",
248
	  "gbrowse", "0",
249
	  "ssl", "0",
249
	  "ssl", "0",
250
	  "crtfile", "/etc/streaming/streamingadminserver.pem",
250
	  "crtfile", "/etc/dss/streamingadminserver.pem",
251
	  "keyfile", "/etc/streaming/streamingadminserver.pem",
251
	  "keyfile", "/etc/dss/streamingadminserver.pem",
252
	  #"keypasswordfile", "",
252
	  #"keypasswordfile", "",
253
	  "qtssQTPasswd", "/usr/local/bin/qtpasswd",
253
	  "qtssQTPasswd", "/usr/bin/qtpasswd",
254
	  "qtssPlaylistBroadcaster", "/usr/local/bin/PlaylistBroadcaster",
254
	  "qtssPlaylistBroadcaster", "/usr/bin/PlaylistBroadcaster",
255
	  "qtssMP3Broadcaster", "/usr/local/bin/MP3Broadcaster",
255
	  "qtssMP3Broadcaster", "/usr/bin/MP3Broadcaster",
256
	  "helpurl", "http://helpqt.apple.com/dssWebAdminHelpR3/dssWebAdmin.help/DSSHelp.htm",
256
	  "helpurl", "http://helpqt.apple.com/dssWebAdminHelpR3/dssWebAdmin.help/DSSHelp.htm",
257
	  "tempfileloc", "/tmp",
257
	  "tempfileloc", "/tmp",
258
	  "qtssAdmin", "streamingadmin",
258
	  "qtssAdmin", "streamingadmin",
259
	  "cacheMessageFiles", "0",
259
	  "cacheMessageFiles", "0",
260
	  "pidfile", "/var/run/streamingadminserver.pid",
260
	  "pidfile", "/var/run/streamingadminserver.pid",
261
	  "runUser", "qtss",
261
	  "runUser", "nobody",
262
	  "runGroup", "qtss",
262
	  "runGroup", "nogroup",
263
	  "cookieExpireSeconds", "600"
263
	  "cookieExpireSeconds", "600"
264
	  );
264
	  );
265
}
265
}
(-)old/DSS-v5_0_3_2/WebAdmin/streamingadminserver.conf (-5 / +5 lines)
Lines 6-16 Link Here
6
6
7
# The root directory for all the html and cgi files
7
# The root directory for all the html and cgi files
8
# The path should be absolute
8
# The path should be absolute
9
root=/Library/QuickTimeStreaming/AdminHtml
9
root=/var/lib/dss/admin
10
10
11
# The root directory for play lists managed by the adminserver
11
# The root directory for play lists managed by the adminserver
12
# The path should be absolute
12
# The path should be absolute
13
plroot=/Library/QuickTimeStreaming/Playlists
13
plroot=/var/lib/dss/media/playlists
14
14
15
# The host name of the streaming admin server
15
# The host name of the streaming admin server
16
host=foo.bar.com
16
host=foo.bar.com
Lines 22-32 Link Here
22
qtssPort=554
22
qtssPort=554
23
23
24
# The name of the streaming server binary
24
# The name of the streaming server binary
25
qtssName=/usr/sbin/QuickTimeStreamingServer
25
qtssName=/usr/sbin/DarwinStreamingServer
26
26
27
# If set to 1, admin server will start qtss when it is launched
27
# If set to 1, admin server will start qtss when it is launched
28
# If set to 0, qtss will not be launched when the admin starts up
28
# If set to 0, qtss will not be launched when the admin starts up
29
qtssAutoStart=1
29
qtssAutoStart=0
30
30
31
# To add new mime types
31
# To add new mime types
32
# If the suffix is xxx, and the
32
# If the suffix is xxx, and the
Lines 41-47 Link Here
41
log=1
41
log=1
42
42
43
# The full path of the streaming admin server log file
43
# The full path of the streaming admin server log file
44
logfile=/Library/QuickTimeStreaming/Logs/streamingadminserver.log
44
logfile=/var/log/dss/streamingadminserver.log
45
45
46
# Number of hours before which logs are rolled
46
# Number of hours before which logs are rolled
47
logtime=168
47
logtime=168
(-)old/DSS-v5_0_3_2/defaultPaths.h (-5 / +5 lines)
Lines 58-68 Link Here
58
58
59
# define DEFAULTPATHS_DIRECTORY_SEPARATOR	"/"
59
# define DEFAULTPATHS_DIRECTORY_SEPARATOR	"/"
60
60
61
# define DEFAULTPATHS_ETC_DIR			"/etc/streaming/"
61
# define DEFAULTPATHS_ETC_DIR			"/etc/dss/"
62
# define DEFAULTPATHS_ETC_DIR_OLD		"/etc/"
62
# define DEFAULTPATHS_ETC_DIR_OLD		"/etc/dss/"
63
# define DEFAULTPATHS_SSM_DIR			"/usr/local/sbin/StreamingServerModules/"
63
# define DEFAULTPATHS_SSM_DIR			"/usr/lib/dss/"
64
# define DEFAULTPATHS_LOG_DIR			"/var/streaming/logs/"
64
# define DEFAULTPATHS_LOG_DIR			"/var/log/dss/"
65
# define DEFAULTPATHS_MOVIES_DIR        "/usr/local/movies/"
65
# define DEFAULTPATHS_MOVIES_DIR        "/var/lib/dss/media/"
66
# define DEFAULTPATHS_PID_DIR           "/var/run/"
66
# define DEFAULTPATHS_PID_DIR           "/var/run/"
67
67
68
#endif
68
#endif
(-)old/DSS-v5_0_3_2/qtaccess (-4 / +4 lines)
Lines 26-32 Link Here
26
# If not given, the default filename is /etc/streaming/qtusers for POSIX
26
# If not given, the default filename is /etc/streaming/qtusers for POSIX
27
# usage: AuthUserFile <user filename>
27
# usage: AuthUserFile <user filename>
28
#AuthUserFile /etc/streaming/qtusers
28
#AuthUserFile /etc/streaming/qtusers
29
AuthUserFile /Library/QuickTimeStreaming/Config/qtusers
29
AuthUserFile /etc/dss/qtusers
30
30
31
# AuthGroupFile: The filename that contains the groups and the 
31
# AuthGroupFile: The filename that contains the groups and the 
32
# users that belong to each group
32
# users that belong to each group
Lines 34-40 Link Here
34
# If not given, the default filename is /etc/streaming/qtgroups for POSIX
34
# If not given, the default filename is /etc/streaming/qtgroups for POSIX
35
# usage: AuthGroupFile  <group filename>
35
# usage: AuthGroupFile  <group filename>
36
#AuthGroupFile  /etc/streaming/qtgroups
36
#AuthGroupFile  /etc/streaming/qtgroups
37
AuthGroupFile /Library/QuickTimeStreaming/Config/qtgroups
37
AuthGroupFile /etc/dss/qtgroups
38
38
39
# require user: The names next to this specify which user 
39
# require user: The names next to this specify which user 
40
# is allowed to access the media in this folder
40
# is allowed to access the media in this folder
Lines 60-67 Link Here
60
# usage: <Limit [READ|WRITE] ..> ... </Limit>
60
# usage: <Limit [READ|WRITE] ..> ... </Limit>
61
<Limit WRITE>
61
<Limit WRITE>
62
 AuthName "streaming server broadcaster realm"
62
 AuthName "streaming server broadcaster realm"
63
 AuthUserFile /Library/QuickTimeStreaming/Config/qtbroadcastusers
63
 AuthUserFile /etc/dss/qtbroadcastusers
64
 AuthGroupFile /Library/QuickTimeStreaming/Config/qtbroadcastgroups
64
 AuthGroupFile /etc/dss/qtbroadcastgroups
65
 require group broadcaster
65
 require group broadcaster
66
</Limit>
66
</Limit>
67
67
(-)old/DSS-v5_0_3_2/qtgroups (-1 / +1 lines)
Line 1 Link Here
1
admin: aGFja21l
1
admin:
(-)old/DSS-v5_0_3_2/qtusers (-1 lines)
Lines 1-2 Link Here
1
realm Streaming Server
1
realm Streaming Server
2
aGFja21l:0muym.z3yrHSw:fa000739887bb2871bcf0c9201b5ebd5
(-)old/DSS-v5_0_3_2/streamingserver.xml-POSIX (-14 / +14 lines)
Lines 1-5 Link Here
1
<?xml version ="1.0"?>
1
<?xml version ="1.0"?>
2
<!-- This is a sample /etc/streaming/streamingserver.xml file -->
2
<!-- This is a sample /etc/dss/streamingserver.xml file -->
3
<!-- The Document Type Definition (DTD) for the file -->
3
<!-- The Document Type Definition (DTD) for the file -->
4
<!DOCTYPE CONFIGURATION [
4
<!DOCTYPE CONFIGURATION [
5
<!ELEMENT CONFIGURATION (SERVER, MODULE*)>
5
<!ELEMENT CONFIGURATION (SERVER, MODULE*)>
Lines 79-85 Link Here
79
	<PREF NAME="error_logfile_interval" TYPE="UInt32">7</PREF>
79
	<PREF NAME="error_logfile_interval" TYPE="UInt32">7</PREF>
80
80
81
	<!-- error log. A value of 0 means unlimited. -->
81
	<!-- error log. A value of 0 means unlimited. -->
82
	<PREF NAME="error_logfile_dir">/var/streaming/logs</PREF>
82
	<PREF NAME="error_logfile_dir">/var/log/dss</PREF>
83
83
84
	<!-- Name of the error log file. -->
84
	<!-- Name of the error log file. -->
85
	<PREF NAME="error_logfile_name">Error</PREF>
85
	<PREF NAME="error_logfile_name">Error</PREF>
Lines 88-94 Link Here
88
    <PREF NAME="pid_file">/var/run/DarwinStreamingServer.pid</PREF>
88
    <PREF NAME="pid_file">/var/run/DarwinStreamingServer.pid</PREF>
89
89
90
	<!-- Path to the folder containing dynamic loadable server modules -->
90
	<!-- Path to the folder containing dynamic loadable server modules -->
91
	<PREF NAME="module_folder">/usr/local/sbin/StreamingServerModules</PREF>
91
	<PREF NAME="module_folder">/usr/lib/dss</PREF>
92
92
93
	<!-- If the server discovers it is serving more than its -->
93
	<!-- If the server discovers it is serving more than its -->
94
	<!-- allowed maximum bandwidth (using the average bandwidth computation) it -->
94
	<!-- allowed maximum bandwidth (using the average bandwidth computation) it -->
Lines 117-123 Link Here
117
	<PREF NAME="bind_ip_addr">0</PREF>
117
	<PREF NAME="bind_ip_addr">0</PREF>
118
118
119
	<!-- Path to the root folder for movies. -->
119
	<!-- Path to the root folder for movies. -->
120
	<PREF NAME="movie_folder">/usr/local/movies/</PREF>
120
	<PREF NAME="movie_folder">/var/lib/dss/media</PREF>
121
121
122
	<!-- Maximum amount of bandwidth the server is allowed to serve. -->
122
	<!-- Maximum amount of bandwidth the server is allowed to serve. -->
123
	<!-- value is in kilobits/sec. While this limit is exceeded, new client requests. -->
123
	<!-- value is in kilobits/sec. While this limit is exceeded, new client requests. -->
Lines 141-150 Link Here
141
	<PREF NAME="rtsp_timeout" TYPE="UInt32">0</PREF>
141
	<PREF NAME="rtsp_timeout" TYPE="UInt32">0</PREF>
142
142
143
	<!-- Run as this user -->
143
	<!-- Run as this user -->
144
	<PREF NAME="run_user_name"></PREF>
144
	<PREF NAME="run_user_name">nobody</PREF>
145
145
146
	<!-- Member of this group -->
146
	<!-- Member of this group -->
147
	<PREF NAME="run_group_name"></PREF>
147
	<PREF NAME="run_group_name">nogroup</PREF>
148
148
149
	<!-- The following 8 prefs implement the server's thinning algorithm. -->
149
	<!-- The following 8 prefs implement the server's thinning algorithm. -->
150
	<!-- They are all in milliseconds -->
150
	<!-- They are all in milliseconds -->
Lines 293-302 Link Here
293
	<PREF NAME="request_logfile_size" TYPE="UInt32">10240000</PREF>
293
	<PREF NAME="request_logfile_size" TYPE="UInt32">10240000</PREF>
294
294
295
	<!-- Path to directory where access logs are stored. -->
295
	<!-- Path to directory where access logs are stored. -->
296
	<PREF NAME="request_logfile_dir">/var/streaming/logs</PREF>
296
	<PREF NAME="request_logfile_dir">/var/log/dss</PREF>
297
297
298
	<!-- Name of the access log file. -->
298
	<!-- Name of the access log file. -->
299
	<PREF NAME="request_logfile_name">StreamingServer</PREF>
299
	<PREF NAME="request_logfile_name">dss</PREF>
300
300
301
	<!-- Either "true" or "false". Logs date time field -->
301
	<!-- Either "true" or "false". Logs date time field -->
302
    <!-- in GMT if true and in localtime if false-->
302
    <!-- in GMT if true and in localtime if false-->
Lines 364-370 Link Here
364
    <PREF NAME="mp3_request_logfile_name" >mp3_access</PREF>
364
    <PREF NAME="mp3_request_logfile_name" >mp3_access</PREF>
365
    
365
    
366
	<!-- Path to directory where access logs are stored. -->
366
	<!-- Path to directory where access logs are stored. -->
367
	<PREF NAME="mp3_request_logfile_dir">/var/streaming/logs</PREF>
367
	<PREF NAME="mp3_request_logfile_dir">/var/log/dss</PREF>
368
368
369
	<!-- Either "true" or "false". This toggles -->
369
	<!-- Either "true" or "false". This toggles -->
370
	<!-- mp3 access logging on and off. -->
370
	<!-- mp3 access logging on and off. -->
Lines 396-409 Link Here
396
	<PREF NAME="http_xfer_enabled" TYPE="Bool16" >false</PREF>
396
	<PREF NAME="http_xfer_enabled" TYPE="Bool16" >false</PREF>
397
	<!-- Path to the http download folder. All files -->
397
	<!-- Path to the http download folder. All files -->
398
	<!-- that are requested from this folder are sent via HTTP -->
398
	<!-- that are requested from this folder are sent via HTTP -->
399
	<PREF NAME="http_folder">/usr/local/movies/http</PREF>
399
	<PREF NAME="http_folder">/var/lib/dss/media/http</PREF>
400
	<!-- Either "true" or "false". This toggles http module -->
400
	<!-- Either "true" or "false". This toggles http module -->
401
	<!-- logging on and off. -->
401
	<!-- logging on and off. -->
402
	<PREF NAME="http_logging" TYPE="Bool16">true</PREF>
402
	<PREF NAME="http_logging" TYPE="Bool16">true</PREF>
403
	<!-- Name of the http module log file. -->
403
	<!-- Name of the http module log file. -->
404
	<PREF NAME="http_logfile_name">Http</PREF>
404
	<PREF NAME="http_logfile_name">Http</PREF>
405
	<!-- Path to directory where http module logs are stored. -->
405
	<!-- Path to directory where http module logs are stored. -->
406
	<PREF NAME="http_logfile_dir">/var/streaming/logs</PREF>
406
	<PREF NAME="http_logfile_dir">/var/log/dss</PREF>
407
	<!-- Maximum allowed size in bytes for the http module log. A -->
407
	<!-- Maximum allowed size in bytes for the http module log. A -->
408
	<!-- value of 0 means unlimited. -->
408
	<!-- value of 0 means unlimited. -->
409
	<PREF NAME="http_logfile_size" TYPE="UInt32">256000</PREF>
409
	<PREF NAME="http_logfile_size" TYPE="UInt32">256000</PREF>
Lines 518-524 Link Here
518
<MODULE NAME="QTSSRelayModule">
518
<MODULE NAME="QTSSRelayModule">
519
	<!-- Relay preferences file. This file should be in the documented .rcf (Relay config file) -->
519
	<!-- Relay preferences file. This file should be in the documented .rcf (Relay config file) -->
520
	<!-- format. The Relay will use this to load up all relay streams -->
520
	<!-- format. The Relay will use this to load up all relay streams -->
521
	<PREF NAME="relay_prefs_file">/etc/streaming/relayconfig.xml</PREF>
521
	<PREF NAME="relay_prefs_file">/etc/dss/relayconfig.xml</PREF>
522
522
523
	<!-- enter this URL into a web browser and get a web page with current stats on -->
523
	<!-- enter this URL into a web browser and get a web page with current stats on -->
524
	<!-- your active relays -->
524
	<!-- your active relays -->
Lines 530-539 Link Here
530
	<PREF NAME="modAccess_qtaccessfilename">qtaccess</PREF>
530
	<PREF NAME="modAccess_qtaccessfilename">qtaccess</PREF>
531
531
532
	<!-- The default path and file name for the AccessModule's groups list -->
532
	<!-- The default path and file name for the AccessModule's groups list -->
533
	<PREF NAME="modAccess_groupsfilepath">/etc/streaming/qtgroups</PREF>
533
	<PREF NAME="modAccess_groupsfilepath">/etc/dss/qtgroups</PREF>
534
534
535
	<!-- The default path and file name for the AccessModule's user list -->
535
	<!-- The default path and file name for the AccessModule's user list -->
536
	<PREF NAME="modAccess_usersfilepath">/etc/streaming/qtusers</PREF>
536
	<PREF NAME="modAccess_usersfilepath">/etc/dss/qtusers</PREF>
537
</MODULE>
537
</MODULE>
538
538
539
<MODULE NAME="QTSSAdminModule">
539
<MODULE NAME="QTSSAdminModule">

Return to bug 84011