diff -Naur old/DarwinStreamingSrvr5.5-Source/WebAdmin/src/streamingadminserver.pl new/DarwinStreamingSrvr5.5-Source/WebAdmin/src/streamingadminserver.pl --- old/DarwinStreamingSrvr5.5-Source/WebAdmin/src/streamingadminserver.pl 2005-07-07 02:57:00.000000000 +0300 +++ new/DarwinStreamingSrvr5.5-Source/WebAdmin/src/streamingadminserver.pl 2005-12-24 17:22:22.000000000 +0200 @@ -78,7 +78,7 @@ $defaultConfigPath = "/Library/QuickTimeStreaming/Config/streamingadminserver.conf"; } else { - $defaultConfigPath = "/etc/streaming/streamingadminserver.conf"; + $defaultConfigPath = "/etc/dss/streamingadminserver.conf"; } $debug = 0; @@ -229,8 +229,8 @@ else { %vital = ("port", 1220, "sslport", 1240, - "root", "/var/streaming/AdminHtml", - "plroot", "/var/streaming/playlists/", + "root", "/var/lib/dss/admin", + "plroot", "/var/lib/dss/media/playlists/", "server", "DSS 5.5 Admin Server/1.0", "index_docs", "index.html parse_xml.cgi index.htm index.cgi", "addtype_html", "text/html", @@ -245,28 +245,28 @@ "realm", "DSS Admin Server", "qtssIPAddress", "localhost", "qtssPort", "554", - "qtssName", "/usr/local/sbin/DarwinStreamingServer", + "qtssName", "/usr/sbin/DarwinStreamingServer", "qtssAutoStart", "1", - "logfile", "/var/streaming/logs/streamingadminserver.log", + "logfile", "/var/log/dss/streamingadminserver.log", "log", "1", "logclear", "0", "logtime", "168", "messagesfile", "messages", "gbrowse", "0", "ssl", "0", - "crtfile", "/etc/streaming/streamingadminserver.pem", - "keyfile", "/etc/streaming/streamingadminserver.pem", + "crtfile", "/etc/dss/streamingadminserver.pem", + "keyfile", "/etc/dss/streamingadminserver.pem", #"keypasswordfile", "", - "qtssQTPasswd", "/usr/local/bin/qtpasswd", - "qtssPlaylistBroadcaster", "/usr/local/bin/PlaylistBroadcaster", - "qtssMP3Broadcaster", "/usr/local/bin/MP3Broadcaster", + "qtssQTPasswd", "/usr/bin/qtpasswd", + "qtssPlaylistBroadcaster", "/usr/bin/PlaylistBroadcaster", + "qtssMP3Broadcaster", "/usr/bin/MP3Broadcaster", "helpurl", "http://helpqt.apple.com/dssWebAdminHelpR3/dssWebAdmin.help/DSSHelp.htm", "tempfileloc", "/tmp", "qtssAdmin", "streamingadmin", "cacheMessageFiles", "0", "pidfile", "/var/run/streamingadminserver.pid", - "runUser", "qtss", - "runGroup", "qtss", + "runUser", "nobody", + "runGroup", "nogroup", "cookieExpireSeconds", "600" ); } diff -Naur old/DarwinStreamingSrvr5.5-Source/WebAdmin/streamingadminserver.conf new/DarwinStreamingSrvr5.5-Source/WebAdmin/streamingadminserver.conf --- old/DarwinStreamingSrvr5.5-Source/WebAdmin/streamingadminserver.conf 2001-08-11 00:29:44.000000000 +0300 +++ new/DarwinStreamingSrvr5.5-Source/WebAdmin/streamingadminserver.conf 2005-12-24 17:27:30.000000000 +0200 @@ -6,11 +6,11 @@ # The root directory for all the html and cgi files # The path should be absolute -root=/Library/QuickTimeStreaming/AdminHtml +root=/var/lib/dss/admin # The root directory for play lists managed by the adminserver # The path should be absolute -plroot=/Library/QuickTimeStreaming/Playlists +plroot=/var/lib/dss/media/playlists # The host name of the streaming admin server host=foo.bar.com @@ -22,11 +22,11 @@ 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 +41,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 diff -Naur old/DarwinStreamingSrvr5.5-Source/defaultPaths.h new/DarwinStreamingSrvr5.5-Source/defaultPaths.h --- old/DarwinStreamingSrvr5.5-Source/defaultPaths.h 2003-08-16 03:52:40.000000000 +0300 +++ new/DarwinStreamingSrvr5.5-Source/defaultPaths.h 2005-12-24 17:31:56.000000000 +0200 @@ -58,11 +58,11 @@ # define DEFAULTPATHS_DIRECTORY_SEPARATOR "/" -# define DEFAULTPATHS_ETC_DIR "/etc/streaming/" -# define DEFAULTPATHS_ETC_DIR_OLD "/etc/" -# define DEFAULTPATHS_SSM_DIR "/usr/local/sbin/StreamingServerModules/" -# define DEFAULTPATHS_LOG_DIR "/var/streaming/logs/" -# define DEFAULTPATHS_MOVIES_DIR "/usr/local/movies/" +# define DEFAULTPATHS_ETC_DIR "/etc/dss/" +# define DEFAULTPATHS_ETC_DIR_OLD "/etc/dss/" +# define DEFAULTPATHS_SSM_DIR "/usr/lib/dss/" +# define DEFAULTPATHS_LOG_DIR "/var/log/dss/" +# define DEFAULTPATHS_MOVIES_DIR "/var/lib/dss/media/" # define DEFAULTPATHS_PID_DIR "/var/run/" #endif diff -Naur old/DarwinStreamingSrvr5.5-Source/qtaccess new/DarwinStreamingSrvr5.5-Source/qtaccess --- old/DarwinStreamingSrvr5.5-Source/qtaccess 2001-11-03 01:44:44.000000000 +0200 +++ new/DarwinStreamingSrvr5.5-Source/qtaccess 2005-12-24 17:35:54.000000000 +0200 @@ -26,7 +26,7 @@ # If not given, the default filename is /etc/streaming/qtusers for POSIX # usage: AuthUserFile #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 @@ -34,7 +34,7 @@ # If not given, the default filename is /etc/streaming/qtgroups for POSIX # usage: AuthGroupFile #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 @@ -60,8 +60,8 @@ # usage: ... 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 diff -Naur old/DarwinStreamingSrvr5.5-Source/qtgroups new/DarwinStreamingSrvr5.5-Source/qtgroups --- old/DarwinStreamingSrvr5.5-Source/qtgroups 2001-10-04 19:33:26.000000000 +0200 +++ new/DarwinStreamingSrvr5.5-Source/qtgroups 2005-12-24 17:36:54.000000000 +0200 @@ -1 +1 @@ -admin: aGFja21l +admin: diff -Naur old/DarwinStreamingSrvr5.5-Source/qtusers new/DarwinStreamingSrvr5.5-Source/qtusers --- old/DarwinStreamingSrvr5.5-Source/qtusers 2001-10-05 01:02:50.000000000 +0200 +++ new/DarwinStreamingSrvr5.5-Source/qtusers 2005-12-24 17:37:44.000000000 +0200 @@ -1,2 +1 @@ realm Streaming Server -aGFja21l:0muym.z3yrHSw:fa000739887bb2871bcf0c9201b5ebd5 diff -Naur old/DarwinStreamingSrvr5.5-Source/streamingserver.xml-POSIX new/DarwinStreamingSrvr5.5-Source/streamingserver.xml-POSIX --- old/DarwinStreamingSrvr5.5-Source/streamingserver.xml-POSIX 2003-04-09 04:30:38.000000000 +0300 +++ new/DarwinStreamingSrvr5.5-Source/streamingserver.xml-POSIX 2005-12-24 17:48:38.000000000 +0200 @@ -1,5 +1,5 @@ - + @@ -79,7 +79,7 @@ 7 - /var/streaming/logs + /var/log/dss Error @@ -88,7 +88,7 @@ /var/run/DarwinStreamingServer.pid - /usr/local/sbin/StreamingServerModules + /usr/lib/dss @@ -117,7 +117,7 @@ 0 - /usr/local/movies/ + /var/lib/dss/media/ @@ -141,10 +141,10 @@ 0 - + nobody - + nogroup @@ -293,10 +293,10 @@ 10240000 - /var/streaming/logs + /var/log/dss - StreamingServer + dss @@ -364,7 +364,7 @@ mp3_access - /var/streaming/logs + /var/log/dss @@ -396,14 +396,14 @@ false - /usr/local/movies/http + /var/lib/dss/media/http true Http - /var/streaming/logs + /var/log/dss 256000 @@ -518,7 +518,7 @@ - /etc/streaming/relayconfig.xml + /etc/dss/relayconfig.xml @@ -530,10 +530,10 @@ qtaccess - /etc/streaming/qtgroups + /etc/dss/qtgroups - /etc/streaming/qtusers + /etc/dss/qtusers