From cc6b71e1aed64fca31f561a11b0be677d813892d Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 23 Oct 2020 20:50:56 +0800 Subject: [PATCH] Update conf to follow wiki --- README.md | 8 ++------ trunk/conf/edge.conf | 2 -- trunk/conf/edge2.conf | 2 -- trunk/conf/ffmpeg.transcode.conf | 2 -- trunk/conf/forward.master.conf | 2 -- trunk/conf/forward.slave.conf | 2 -- trunk/conf/hls.conf | 6 +----- trunk/conf/http.flv.live.conf | 2 -- trunk/conf/http.flv.live.edge1.conf | 2 -- trunk/conf/http.flv.live.edge2.conf | 2 -- trunk/conf/ingest.conf | 2 -- trunk/conf/origin.conf | 2 -- trunk/conf/realtime.conf | 2 -- trunk/conf/rtmp.conf | 2 -- 14 files changed, 3 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 727c0e0d5..6c8e5be6a 100755 --- a/README.md +++ b/README.md @@ -55,16 +55,12 @@ docker run -p 1935:1935 -p 1985:1985 -p 8080:8080 \ * Usage: How to delivery HTTP FLV Live Streaming?([CN][v3_CN_SampleHttpFlv], [EN][v3_EN_SampleHttpFlv]) * Usage: How to delivery HTTP FLV Live Streaming Cluster?([CN][v3_CN_SampleHttpFlvCluster], [EN][v3_EN_SampleHttpFlvCluster]) * Usage: How to delivery HLS?([CN][v3_CN_SampleHLS], [EN][v3_EN_SampleHLS]) -* Usage: How to delivery HLS for other codec?([CN][v3_CN_SampleTranscode2HLS], [EN][v3_EN_SampleTranscode2HLS]) * Usage: How to transode RTMP 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 deploy in low lantency mode?([CN][v3_CN_SampleRealtime], [EN][v3_EN_SampleRealtime]) * Usage: How to ingest file/stream/device to RTMP?([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 publish h.264 raw stream as RTMP? ([CN][v3_CN_SrsLibrtmp2], [EN][v3_EN_SrsLibrtmp2]) -* Usage: How to improve edge performance by multiple CPUs? ([CN][v3_CN_REUSEPORT], [EN][v3_EN_REUSEPORT]) -* Usage: Why choose SRS? About the milestone and product plan? ([CN][v1_CN_Product], [EN][v1_EN_Product]) -* Usage: How to file bug or chat with us? ([CN][v1_CN_Contact], [EN][v1_EN_Contact]) +* Usage: How to improve edge performance for multiple CPUs? ([CN][v3_CN_REUSEPORT], [EN][v3_EN_REUSEPORT]) +* Usage: How to file a bug or contact us? ([CN][v1_CN_Contact], [EN][v1_EN_Contact]) ## Wiki diff --git a/trunk/conf/edge.conf b/trunk/conf/edge.conf index 36acb431f..d4233b31f 100644 --- 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; diff --git a/trunk/conf/edge2.conf b/trunk/conf/edge2.conf index 193238d88..52d469a44 100644 --- 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; diff --git a/trunk/conf/ffmpeg.transcode.conf b/trunk/conf/ffmpeg.transcode.conf index d785a44ff..1bb505556 100644 --- 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; diff --git a/trunk/conf/forward.master.conf b/trunk/conf/forward.master.conf index 630a4c84e..2366f3195 100644 --- 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; diff --git a/trunk/conf/forward.slave.conf b/trunk/conf/forward.slave.conf index 98286e33e..f4cc1a37f 100644 --- 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__ { } diff --git a/trunk/conf/hls.conf b/trunk/conf/hls.conf index 17416a294..a0979eb19 100644 --- 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; } } diff --git a/trunk/conf/http.flv.live.conf b/trunk/conf/http.flv.live.conf index 78c28546d..09ba1dffc 100644 --- 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; diff --git a/trunk/conf/http.flv.live.edge1.conf b/trunk/conf/http.flv.live.edge1.conf index 23af7d1ca..ac2f6b344 100644 --- 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; diff --git a/trunk/conf/http.flv.live.edge2.conf b/trunk/conf/http.flv.live.edge2.conf index fcf226066..c1ab67551 100644 --- 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; diff --git a/trunk/conf/ingest.conf b/trunk/conf/ingest.conf index d77a2f954..7b3d1c2ed 100644 --- 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; diff --git a/trunk/conf/origin.conf b/trunk/conf/origin.conf index f27abb0ad..5f9eaeefc 100644 --- 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__ { } diff --git a/trunk/conf/realtime.conf b/trunk/conf/realtime.conf index 482add3ea..26b9b989f 100644 --- 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; diff --git a/trunk/conf/rtmp.conf b/trunk/conf/rtmp.conf index e05f15408..94c740c50 100644 --- 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__ { }