Merge branch 'master' of git.ubicast.net:mediaserver/envsetup

6.Nginx/vhost_streaming.conf

-proxy_cache_path /tmp/nginx-streaming levels=1:2 keys_zone=cache:10m max_size=1g inactive=5m;
-
 server {
 	listen 80;
 	server_name {{ server_name }};