dstreamserv-defaultpath.patch

   1 --- DSS-v5_0_3_2/defaultPaths.h.orig    2003-08-16 01:52:39.000000000 +0200
   2 +++ DSS-v5_0_3_2/defaultPaths.h 2005-03-29 15:55:50.483775960 +0200
   3 @@ -60,9 +60,9 @@
   4
   5  # define DEFAULTPATHS_ETC_DIR                  "/etc/streaming/"
   6  # define DEFAULTPATHS_ETC_DIR_OLD              "/etc/"
   7 -# define DEFAULTPATHS_SSM_DIR                  "/usr/local/sbin/StreamingServerModules/"
   8 -# define DEFAULTPATHS_LOG_DIR                  "/var/streaming/logs/"
   9 -# define DEFAULTPATHS_MOVIES_DIR        "/usr/local/movies/"
  10 +# define DEFAULTPATHS_SSM_DIR                  "/usr/lib/StreamingServerModules/"
  11 +# define DEFAULTPATHS_LOG_DIR                  "/var/log/streaming/"
  12 +# define DEFAULTPATHS_MOVIES_DIR        "/var/lib/streaming/movies/"
  13  # define DEFAULTPATHS_PID_DIR           "/var/run/"
  14
  15  #endif
  16 --- DSS-v5_0_3_2/WebAdmin/src/streamingadminserver.pl.orig      2003-08-28 01:21:55.000000000 +0200
  17 +++ DSS-v5_0_3_2/WebAdmin/src/streamingadminserver.pl   2005-03-29 16:12:14.000000000 +0200
  18 @@ -222,8 +222,8 @@
  19  else {
  20         %vital = ("port", 1220,
  21           "sslport", 1240,
  22 -         "root", "/var/streaming/AdminHtml",
  23 -      "plroot", "/var/streaming/playlists/",
  24 +         "root", "/usr/share/streaming/AdminHtml",
  25 +      "plroot", "/var/lib/streaming/playlists/",
  26           "server", "DSS 4.1 Admin Server/1.0",
  27           "index_docs", "index.html parse_xml.cgi index.htm index.cgi",
  28           "addtype_html", "text/html",
  29 @@ -238,9 +238,9 @@
  30           "realm", "DSS Admin Server",
  31           "qtssIPAddress", "localhost",
  32           "qtssPort", "554",
  33 -         "qtssName", "/usr/local/sbin/DarwinStreamingServer",
  34 +         "qtssName", "/usr/sbin/DarwinStreamingServer",
  35        "qtssAutoStart", "1",
  36 -         "logfile", "/var/streaming/logs/streamingadminserver.log",
  37 +         "logfile", "/var/log/streaming/streamingadminserver.log",
  38           "log", "1",
  39           "logclear", "0",
  40           "logtime", "168",
  41 @@ -250,9 +250,9 @@
  42           "crtfile", "/etc/streaming/streamingadminserver.pem",
  43           "keyfile", "/etc/streaming/streamingadminserver.pem",
  44           #"keypasswordfile", "",
  45 -         "qtssQTPasswd", "/usr/local/bin/qtpasswd",
  46 -         "qtssPlaylistBroadcaster", "/usr/local/bin/PlaylistBroadcaster",
  47 -         "qtssMP3Broadcaster", "/usr/local/bin/MP3Broadcaster",
  48 +         "qtssQTPasswd", "/usr/sbin/qtpasswd",
  49 +         "qtssPlaylistBroadcaster", "/usr/bin/PlaylistBroadcaster",
  50 +         "qtssMP3Broadcaster", "/usr/bin/MP3Broadcaster",
  51           "helpurl", "http://helpqt.apple.com/dssWebAdminHelpR3/dssWebAdmin.help/DSSHelp.htm",
  52           "tempfileloc", "/tmp",
  53           "qtssAdmin", "streamingadmin",
  54 --- DSS-v5_0_3_2/streamingserver.xml-POSIX.orig 2003-04-09 02:30:00.000000000 +0200
  55 +++ DSS-v5_0_3_2/streamingserver.xml-POSIX      2005-03-29 18:45:24.940054128 +0200
  56 @@ -79,7 +79,7 @@
  57         <PREF NAME="error_logfile_interval" TYPE="UInt32">7</PREF>
  58
  59         <!-- error log. A value of 0 means unlimited. -->
  60 -       <PREF NAME="error_logfile_dir">/var/streaming/logs</PREF>
  61 +       <PREF NAME="error_logfile_dir">/var/log/streaming</PREF>
  62
  63         <!-- Name of the error log file. -->
  64         <PREF NAME="error_logfile_name">Error</PREF>
  65 @@ -88,7 +88,7 @@
  66      <PREF NAME="pid_file">/var/run/DarwinStreamingServer.pid</PREF>
  67
  68         <!-- Path to the folder containing dynamic loadable server modules -->
  69 -       <PREF NAME="module_folder">/usr/local/sbin/StreamingServerModules</PREF>
  70 +       <PREF NAME="module_folder">/usr/lib/StreamingServerModules</PREF>
  71
  72         <!-- If the server discovers it is serving more than its -->
  73         <!-- allowed maximum bandwidth (using the average bandwidth computation) it -->
  74 @@ -117,7 +117,7 @@
  75         <PREF NAME="bind_ip_addr">0</PREF>
  76
  77         <!-- Path to the root folder for movies. -->
  78 -       <PREF NAME="movie_folder">/usr/local/movies/</PREF>
  79 +       <PREF NAME="movie_folder">/var/lib/streaming/movies/</PREF>
  80
  81         <!-- Maximum amount of bandwidth the server is allowed to serve. -->
  82         <!-- value is in kilobits/sec. While this limit is exceeded, new client requests. -->
  83 @@ -293,7 +293,7 @@
  84         <PREF NAME="request_logfile_size" TYPE="UInt32">10240000</PREF>
  85
  86         <!-- Path to directory where access logs are stored. -->
  87 -       <PREF NAME="request_logfile_dir">/var/streaming/logs</PREF>
  88 +       <PREF NAME="request_logfile_dir">/var/log/streaming</PREF>
  89
  90         <!-- Name of the access log file. -->
  91         <PREF NAME="request_logfile_name">StreamingServer</PREF>
  92 @@ -364,7 +364,7 @@
  93      <PREF NAME="mp3_request_logfile_name" >mp3_access</PREF>
  94
  95         <!-- Path to directory where access logs are stored. -->
  96 -       <PREF NAME="mp3_request_logfile_dir">/var/streaming/logs</PREF>
  97 +       <PREF NAME="mp3_request_logfile_dir">/var/log/streaming</PREF>
  98
  99         <!-- Either "true" or "false". This toggles -->
 100         <!-- mp3 access logging on and off. -->
 101 @@ -396,14 +396,14 @@
 102         <PREF NAME="http_xfer_enabled" TYPE="Bool16" >false</PREF>
 103         <!-- Path to the http download folder. All files -->
 104         <!-- that are requested from this folder are sent via HTTP -->
 105 -       <PREF NAME="http_folder">/usr/local/movies/http</PREF>
 106 +       <PREF NAME="http_folder">/var/lib/streaming/http</PREF>
 107         <!-- Either "true" or "false". This toggles http module -->
 108         <!-- logging on and off. -->
 109         <PREF NAME="http_logging" TYPE="Bool16">true</PREF>
 110         <!-- Name of the http module log file. -->
 111         <PREF NAME="http_logfile_name">Http</PREF>
 112         <!-- Path to directory where http module logs are stored. -->
 113 -       <PREF NAME="http_logfile_dir">/var/streaming/logs</PREF>
 114 +       <PREF NAME="http_logfile_dir">/var/log/streaming</PREF>
 115         <!-- Maximum allowed size in bytes for the http module log. A -->
 116         <!-- value of 0 means unlimited. -->
 117         <PREF NAME="http_logfile_size" TYPE="UInt32">256000</PREF>