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

refine the conf, use srs3 style

Browse source
This commit is contained in:
winlin 2015-09-11 08:21:06 +08:00
parent 77d21f7e32
commit 7ae76b579e
6 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/conf/demo.19350.conf
View file

@ -11,7 +11,9 @@ pid ./objs/srs.demo.19350.pid;
vhost __defaultVhost__ { vhost __defaultVhost__ {
enabled on; enabled on;
gop_cache on; play {
gop_cache on;
}
hls { hls {
enabled on; enabled on;
hls_path ./objs/nginx/html/forward; hls_path ./objs/nginx/html/forward;

14
trunk/conf/full.conf
View file

@ -445,17 +445,19 @@ vhost play.srs.com {
# vhost for time jitter # vhost for time jitter
vhost jitter.srs.com { vhost jitter.srs.com {
# @see play.srs.com # @see play.srs.com
time_jitter full; play {
# @see play.srs.com time_jitter full;
mix_correct off; mix_correct off;
}
} }
# vhost for atc. # vhost for atc.
vhost atc.srs.com { vhost atc.srs.com {
# @see play.srs.com # @see play.srs.com
atc on; play {
# @see play.srs.com atc on;
atc_auto on; atc_auto on;
}
} }
# the MR(merged-read) setting for publisher. # the MR(merged-read) setting for publisher.

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

@ -12,8 +12,10 @@ http_server {
dir ./objs/nginx/html; dir ./objs/nginx/html;
} }
vhost __defaultVhost__ { vhost __defaultVhost__ {
mode remote; cluster {
origin 127.0.0.1; mode remote;
origin 127.0.0.1;
}
http_remux { http_remux {
enabled on; enabled on;
mount [vhost]/[app]/[stream].flv; mount [vhost]/[app]/[stream].flv;

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

@ -12,8 +12,10 @@ http_server {
dir ./objs/nginx/html; dir ./objs/nginx/html;
} }
vhost __defaultVhost__ { vhost __defaultVhost__ {
mode remote; cluster {
origin 127.0.0.1; mode remote;
origin 127.0.0.1;
}
http_remux { http_remux {
enabled on; enabled on;
mount [vhost]/[app]/[stream].flv; mount [vhost]/[app]/[stream].flv;

2
trunk/conf/http.server.conf
View file

@ -9,7 +9,7 @@ http_server {
dir ./objs/nginx/html; dir ./objs/nginx/html;
} }
vhost ossrs.net { vhost ossrs.net {
http { http_static {
enabled on; enabled on;
mount [vhost]/; mount [vhost]/;
dir ./objs/nginx/html; dir ./objs/nginx/html;

8
trunk/conf/transform.edge.conf
View file

@ -21,7 +21,9 @@ vhost source.srs.com {
} }
} }
vhost transform.srs.edge.com { vhost transform.srs.edge.com {
mode remote; cluster {
origin 127.0.0.1:1935; mode remote;
vhost source.srs.com; origin 127.0.0.1:1935;
vhost source.srs.com;
}
} }