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

Merge branch 'master' of github.com:winlinvip/simple-rtmp-server

This commit is contained in:
winlin 2014-03-20 18:56:48 +08:00
commit 8600c0ebe9

View file

@ -366,6 +366,7 @@ ln -sf `pwd`/${SRS_OBJS}/nginx/html/live research/api-server/static-dir/live &&
rm -rf research/api-server/static-dir/forward &&
mkdir -p `pwd`/${SRS_OBJS}/nginx/html/forward &&
ln -sf `pwd`/${SRS_OBJS}/nginx/html/forward research/api-server/static-dir/forward
ret=$?; if [[ $ret -ne 0 ]]; then echo "link players to cherrypy static-dir failed, ret=$ret"; exit $ret; fi
# only when the nginx is ok,
# if api-server not enalbed, use nginx as demo.