diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 4b604efeb..c4997f6f7 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -270,6 +270,9 @@ if [ $SRS_HLS = YES ]; then ln -sf `pwd`/research/players ${SRS_OBJS}/nginx/html/players && rm -f ${SRS_OBJS}/nginx/crossdomain.xml && ln -sf `pwd`/research/players/crossdomain.xml ${SRS_OBJS}/nginx/html/crossdomain.xml + + # nginx.html to detect whether nginx is alive + echo "nginx is ok" > ${SRS_OBJS}/nginx/html/nginx.html fi if [ $SRS_HLS = YES ]; then diff --git a/trunk/conf/hls.conf b/trunk/conf/hls.conf new file mode 100644 index 000000000..c2fc819ce --- /dev/null +++ b/trunk/conf/hls.conf @@ -0,0 +1,9 @@ +listen 1935; +vhost __defaultVhost__ { + hls { + enabled on; + hls_path ./objs/nginx/html; + hls_fragment 10; + hls_window 60; + } +} diff --git a/trunk/conf/rtmp.conf b/trunk/conf/rtmp.conf old mode 100755 new mode 100644 diff --git a/trunk/conf/srs.19350.conf b/trunk/conf/srs.19350.conf old mode 100755 new mode 100644