external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 11:21:52 +00:00
Code Issues Releases Wiki Activity

Update conf to follow wiki

Browse source
This commit is contained in:
winlin 2020-10-23 20:50:56 +08:00
parent 3f3a23f978
commit cc6b71e1ae
14 changed files with 3 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -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])
<a name="srs-30-wiki"></a>
## Wiki

2
trunk/conf/edge.conf
View file

@ -5,8 +5,6 @@
listen 1935;
max_connections 1000;
pid objs/edge.pid;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
cluster {
mode remote;

2
trunk/conf/edge2.conf
View file

@ -5,8 +5,6 @@
listen 1935;
max_connections 1000;
pid objs/edge2.pid;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
cluster {
mode remote;

2
trunk/conf/ffmpeg.transcode.conf
View file

@ -4,8 +4,6 @@
listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
transcode {
enabled on;

2
trunk/conf/forward.master.conf
View file

@ -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;

2
trunk/conf/forward.slave.conf
View file

@ -5,7 +5,5 @@
listen 19350;
max_connections 1000;
pid ./objs/srs.slave.pid;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
}

6
trunk/conf/hls.conf
View file

@ -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;
}
}

2
trunk/conf/http.flv.live.conf
View file

@ -4,8 +4,6 @@
listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
http_server {
enabled on;
listen 8080;

2
trunk/conf/http.flv.live.edge1.conf
View file

@ -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;

2
trunk/conf/http.flv.live.edge2.conf
View file

@ -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;

2
trunk/conf/ingest.conf
View file

@ -4,8 +4,6 @@
listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
ingest livestream {
enabled on;

2
trunk/conf/origin.conf
View file

@ -4,8 +4,6 @@
listen 19350;
max_connections 1000;
daemon off;
srs_log_tank console;
pid ./objs/origin.pid;
vhost __defaultVhost__ {
}

2
trunk/conf/realtime.conf
View file

@ -4,8 +4,6 @@
listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
tcp_nodelay on
min_latency on;

2
trunk/conf/rtmp.conf
View file

@ -4,7 +4,5 @@
listen 1935;
max_connections 1000;
daemon off;
srs_log_tank console;
vhost __defaultVhost__ {
}