winlin

add wiki and conf for token traverse auth

@@ -212,6 +212,7 @@ Supported operating systems and hardware: @@ -212,6 +212,7 @@ Supported operating systems and hardware:
212 1. Support RTMP [edge](https://github.com/winlinvip/simple-rtmp-server/wiki/Edge) server, push/pull stream from any RTMP server 212 1. Support RTMP [edge](https://github.com/winlinvip/simple-rtmp-server/wiki/Edge) server, push/pull stream from any RTMP server
213 1. Support tracable log, session based log. 213 1. Support tracable log, session based log.
214 1. Support [vod stream(http flv/hls vod stream)](https://github.com/winlinvip/simple-rtmp-server/wiki/FlvVodStream). 214 1. Support [vod stream(http flv/hls vod stream)](https://github.com/winlinvip/simple-rtmp-server/wiki/FlvVodStream).
  215 +1. Support DRM [token traverse](https://github.com/winlinvip/simple-rtmp-server/wiki/DRM#tokentraverse) for fms origin authenticate.
215 1. [dev] Support system full utest on gtest. 216 1. [dev] Support system full utest on gtest.
216 1. [plan] Support RTMP 302 redirect [#92](https://github.com/winlinvip/simple-rtmp-server/issues/92). 217 1. [plan] Support RTMP 302 redirect [#92](https://github.com/winlinvip/simple-rtmp-server/issues/92).
217 1. [plan] Support multiple processes, for both origin and edge 218 1. [plan] Support multiple processes, for both origin and edge
@@ -240,7 +241,7 @@ Supported operating systems and hardware: @@ -240,7 +241,7 @@ Supported operating systems and hardware:
240 * 2013-10-17, Created.<br/> 241 * 2013-10-17, Created.<br/>
241 242
242 ## History 243 ## History
243 -* v1.0, 2014-06-21, support edge token traverse, fix [#104](https://github.com/winlinvip/simple-rtmp-server/issues/104). 0.9.129 244 +* v1.0, 2014-06-21, support edge [token traverse](https://github.com/winlinvip/simple-rtmp-server/wiki/DRM#tokentraverse), fix [#104](https://github.com/winlinvip/simple-rtmp-server/issues/104). 0.9.129
244 * v1.0, 2014-06-19, add connections count to api summaries. 0.9.127 245 * v1.0, 2014-06-19, add connections count to api summaries. 0.9.127
245 * v1.0, 2014-06-19, add srs bytes and kbps to api summaries. 0.9.126 246 * v1.0, 2014-06-19, add srs bytes and kbps to api summaries. 0.9.126
246 * v1.0, 2014-06-18, add network bytes to api summaries. 0.9.125 247 * v1.0, 2014-06-18, add network bytes to api summaries. 0.9.125
  1 +# the config for srs origin-edge cluster
  2 +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/Edge
  3 +# @see full.conf for detail config.
  4 +
  5 +listen 1935;
  6 +pid objs/edge.pid;
  7 +srs_log_file ./objs/edge.log;
  8 +vhost __defaultVhost__ {
  9 + mode remote;
  10 + origin 127.0.0.1:19350;
  11 +}
  1 +# the config for srs for token traverse authentication
  2 +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/DRM
  3 +# @see full.conf for detail config.
  4 +
  5 +listen 1935;
  6 +vhost __defaultVhost__ {
  7 + mode remote;
  8 + origin 127.0.0.1:19350;
  9 + token_traverse on;
  10 +}
  1 +# the config for srs origin-edge cluster
  2 +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/Edge
  3 +# @see full.conf for detail config.
  4 +
  5 +listen 19350;
  6 +pid objs/origin.pid;
  7 +srs_log_file ./objs/origin.log;
  8 +vhost __defaultVhost__ {
  9 +}