Update conf to follow wiki

4 years ago · 4ff8a055c5
parent d5a0ad3dd8 cc6b71e1ae
commit 4ff8a055c5
17 changed files with 1 additions and 39 deletions
--- a/README.md
+++ b/README.md
@ -58,16 +58,12 @@ docker run -p 1935:1935 -p 1985:1985 -p 8080:8080 \
 * Usage: How to publish GB28181 to SRS? [#1500](https://github.com/ossrs/srs/issues/1500#issuecomment-606695679)
 * Usage: How to play WebRTC from SRS? [#307](https://github.com/ossrs/srs/issues/307#issuecomment-602193458)
 * Usage: How to publish SRT(Experimental) to SRS?([CN][v4_CN_SampleSRT], [EN][v4_EN_SampleSRT])
-* Usage: How to transcode to h.264+aac for HLS?([CN][v3_CN_SampleTranscode2HLS], [EN][v3_EN_SampleTranscode2HLS])
 * Usage: How to transode stream by FFMPEG?([CN][v2_CN_SampleFFMPEG], [EN][v2_EN_SampleFFMPEG])
 * Usage: How to forward stream to other servers?([CN][v3_CN_SampleForward], [EN][v3_EN_SampleForward])
 * Usage: How to enable low lantency live streaming?([CN][v3_CN_SampleRealtime], [EN][v3_EN_SampleRealtime])
 * Usage: How to ingest file/stream/device to SRS?([CN][v1_CN_SampleIngest], [EN][v1_EN_SampleIngest])
-* Usage: How to delivery HLS by SRS HTTP server?([CN][v3_CN_SampleHTTP], [EN][v3_EN_SampleHTTP])
 * Usage: How to delivery DASH(Experimental)?([CN][v3_CN_SampleDASH], [EN][v3_EN_SampleDASH])
-* Usage: How to publish h.264 raw stream as RTMP? ([CN][v3_CN_SrsLibrtmp2], [EN][v3_EN_SrsLibrtmp2])
 * Usage: How to enable multiple processes? ([CN][v3_CN_REUSEPORT], [EN][v3_EN_REUSEPORT])
-* Usage: Why SRS? What's the milestones? ([CN][v1_CN_Product], [EN][v1_EN_Product])
 * Usage: Want to contact us? ([CN][v1_CN_Contact], [EN][v1_EN_Contact]) Or file an issue [here](https://github.com/ossrs/srs/issues/new)?

 <a name="srs-30-wiki"></a>
--- a/trunk/conf/edge.conf
+++ b/trunk/conf/edge.conf
@ -5,8 +5,6 @@
 listen              1935;
 max_connections     1000;
 pid                 objs/edge.pid;
-daemon              off;
-srs_log_tank        console;
 vhost __defaultVhost__ {
    cluster {
        mode            remote;
--- a/trunk/conf/edge2.conf
+++ b/trunk/conf/edge2.conf
@ -5,8 +5,6 @@
 listen              1935;
 max_connections     1000;
 pid                 objs/edge2.pid;
-daemon              off;
-srs_log_tank        console;
 vhost __defaultVhost__ {
    cluster {
        mode            remote;
--- a/trunk/conf/ffmpeg.transcode.conf
+++ b/trunk/conf/ffmpeg.transcode.conf
@ -4,8 +4,6 @@

 listen              1935;
 max_connections     1000;
-daemon              off;
-srs_log_tank        console;
 vhost __defaultVhost__ {
    transcode {
        enabled     on;
--- a/trunk/conf/forward.master.conf
+++ b/trunk/conf/forward.master.conf
@ -5,8 +5,6 @@
 listen              1935;
 max_connections     1000;
 pid                 ./objs/srs.master.pid;
-daemon              off;
-srs_log_tank        console;
 vhost __defaultVhost__ {
    forward {
        enabled on;
--- a/trunk/conf/forward.slave.conf
+++ b/trunk/conf/forward.slave.conf
@ -5,7 +5,5 @@
 listen              19350;
 max_connections     1000;
 pid                 ./objs/srs.slave.pid;
-daemon              off;
-srs_log_tank        console;
 vhost __defaultVhost__ {
 }
--- a/trunk/conf/hls.conf
+++ b/trunk/conf/hls.conf
@ -4,8 +4,6 @@

 listen              1935;
 max_connections     1000;
-daemon              off;
-srs_log_tank        console;
 http_server {
    enabled         on;
    listen          8080;
@ -14,10 +12,8 @@ http_server {
 vhost __defaultVhost__ {
    hls {
        enabled         on;
+        hls_path        ./objs/nginx/html;
        hls_fragment    10;
        hls_window      60;
-        hls_path        ./objs/nginx/html;
-        hls_m3u8_file   [app]/[stream].m3u8;
-        hls_ts_file     [app]/[stream]-[seq].ts;
    }
 }
--- a/trunk/conf/http.flv.live.conf
+++ b/trunk/conf/http.flv.live.conf
@ -4,8 +4,6 @@

 listen              1935;
 max_connections     1000;
-daemon              off;
-srs_log_tank        console;
 http_server {
    enabled         on;
    listen          8080;
--- a/trunk/conf/http.flv.live.edge1.conf
+++ b/trunk/conf/http.flv.live.edge1.conf
@ -5,8 +5,6 @@
 listen              19351;
 max_connections     1000;
 pid                 objs/srs.flv.19351.pid;
-daemon              off;
-srs_log_tank        console;
 http_server {
    enabled         on;
    listen          8081;
--- a/trunk/conf/http.flv.live.edge2.conf
+++ b/trunk/conf/http.flv.live.edge2.conf
@ -5,8 +5,6 @@
 listen              19352;
 max_connections     1000;
 pid                 objs/srs.flv.19352.pid;
-daemon              off;
-srs_log_tank        console;
 http_server {
    enabled         on;
    listen          8082;
--- a/trunk/conf/ingest.conf
+++ b/trunk/conf/ingest.conf
@ -4,8 +4,6 @@

 listen              1935;
 max_connections     1000;
-daemon              off;
-srs_log_tank        console;
 vhost __defaultVhost__ {
    ingest livestream {
        enabled      on;
--- a/trunk/conf/origin.conf
+++ b/trunk/conf/origin.conf
@ -4,8 +4,6 @@

 listen              19350;
 max_connections     1000;
-daemon              off;
-srs_log_tank        console;
 pid                 ./objs/origin.pid;
 vhost __defaultVhost__ {
 }
--- a/trunk/conf/push.gb28181.conf
+++ b/trunk/conf/push.gb28181.conf
@ -2,8 +2,6 @@

 listen                  1935;
 max_connections         1000;
-daemon                  off;
-srs_log_tank            console;

 http_api {
    enabled         on;
--- a/trunk/conf/realtime.conf
+++ b/trunk/conf/realtime.conf
@ -4,8 +4,6 @@

 listen              1935;
 max_connections     1000;
-daemon              off;
-srs_log_tank        console;
 vhost __defaultVhost__ {
    tcp_nodelay     on
    min_latency     on;
--- a/trunk/conf/rtc.conf
+++ b/trunk/conf/rtc.conf
@ -1,9 +1,7 @@

 listen              1935;
 max_connections     1000;
-srs_log_tank        console;
 srs_log_file        ./objs/srs.log;
-daemon              off;

 http_server {
    enabled         on;
--- a/trunk/conf/rtmp.conf
+++ b/trunk/conf/rtmp.conf
@ -4,7 +4,5 @@

 listen              1935;
 max_connections     1000;
-daemon              off;
-srs_log_tank        console;
 vhost __defaultVhost__ {
 }
--- a/trunk/conf/srt.conf
+++ b/trunk/conf/srt.conf
@ -2,8 +2,6 @@

 listen              1935;
 max_connections     1000;
-srs_log_tank        console;
-daemon              off;

 http_api {
    enabled         on;