add wiki and conf for token traverse auth

ossrs · Jun 21, 2014 · e9c96af · e9c96af
1 parent 41857ed
commit e9c96af
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -212,6 +212,7 @@ Supported operating systems and hardware:
 1. Support RTMP [edge](https://github.com/winlinvip/simple-rtmp-server/wiki/Edge) server, push/pull stream from any RTMP server
 1. Support tracable log, session based log.
 1. Support [vod stream(http flv/hls vod stream)](https://github.com/winlinvip/simple-rtmp-server/wiki/FlvVodStream).
+1. Support DRM [token traverse](https://github.com/winlinvip/simple-rtmp-server/wiki/DRM#tokentraverse) for fms origin authenticate.
 1. [dev] Support system full utest on gtest.
 1. [plan] Support RTMP 302 redirect [#92](https://github.com/winlinvip/simple-rtmp-server/issues/92).
 1. [plan] Support multiple processes, for both origin and edge
@@ -240,7 +241,7 @@ Supported operating systems and hardware:
 * 2013-10-17, Created.<br/>
 
 ## History
-* v1.0, 2014-06-21, support edge token traverse, fix [#104](https://github.com/winlinvip/simple-rtmp-server/issues/104). 0.9.129
+* 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
 * v1.0, 2014-06-19, add connections count to api summaries. 0.9.127
 * v1.0, 2014-06-19, add srs bytes and kbps to api summaries. 0.9.126
 * v1.0, 2014-06-18, add network bytes to api summaries. 0.9.125

diff --git a/trunk/conf/edge.conf b/trunk/conf/edge.conf
@@ -0,0 +1,11 @@
+# the config for srs origin-edge cluster
+# @see https://github.com/winlinvip/simple-rtmp-server/wiki/Edge
+# @see full.conf for detail config.
+
+listen              1935;
+pid                 objs/edge.pid;
+srs_log_file        ./objs/edge.log;
+vhost __defaultVhost__ {
+    mode            remote;
+    origin          127.0.0.1:19350;
+}
diff --git a/trunk/conf/edge.token.traverse.conf b/trunk/conf/edge.token.traverse.conf
@@ -0,0 +1,10 @@
+# the config for srs for token traverse authentication
+# @see https://github.com/winlinvip/simple-rtmp-server/wiki/DRM
+# @see full.conf for detail config.
+
+listen              1935;
+vhost __defaultVhost__ {
+    mode            remote;
+    origin          127.0.0.1:19350;
+    token_traverse  on;
+}
diff --git a/trunk/conf/origin.conf b/trunk/conf/origin.conf
@@ -0,0 +1,9 @@
+# the config for srs origin-edge cluster
+# @see https://github.com/winlinvip/simple-rtmp-server/wiki/Edge
+# @see full.conf for detail config.
+
+listen              19350;
+pid                 objs/origin.pid;
+srs_log_file        ./objs/origin.log;
+vhost __defaultVhost__ {
+}