external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Squash: Merge SRS 4.0

Browse source
This commit is contained in:
winlin 2021-10-10 12:05:26 +08:00
parent 6c597facfb
commit a81aa2edc5
65 changed files with 276 additions and 5990 deletions
Download patch file Download diff file Expand all files Collapse all files

19
trunk/conf/docker.conf
View file

@ -1,4 +1,4 @@
# main config for srs.
# docker config for srs.
# @see full.conf for detail config.
listen 1935;
@ -14,20 +14,10 @@ http_server {
listen 8080;
dir ./objs/nginx/html;
}
stats {
network 0;
disk sda sdb xvda xvdb;
}
rtc_server {
enabled on;
# Listen at udp://8000
listen 8000;
#
# The $CANDIDATE means fetch from env, if not configed, use * as default.
#
# The * means retrieving server IP automatically, from all network interfaces,
# @see https://github.com/ossrs/srs/issues/307#issuecomment-599028124
candidate $CANDIDATE;
enabled on;
listen 8000;
candidate $CANDIDATE;
}
vhost __defaultVhost__ {
hls {
@ -39,6 +29,5 @@ vhost __defaultVhost__ {
}
rtc {
enabled on;
bframe discard;
}
}