Commit cfdb5413 authored by dreamer's avatar dreamer
Browse files

Merge branch 'revert-cfa5008c' into 'master'

Revert "Merge branch 'caching' into 'master'"

See merge request !8
parents 0aab9764 16091995
......@@ -101,21 +101,14 @@ http {
server {
listen 80;
if ($request_uri ~* \.m3u8$) {
add_header Cache-Control: public;
add_header Cache-Control: max-age=20;
}
if ($request_uri ~* \.ts$) {
add_header Cache-Control: public;
add_header Cache-Control: max-age=200;
}
location /hls {
types {
application/vnd.apple.mpegurl m3u8;
video/mp2t ts;
}
root /opt/data;
add_header Cache-Control no-cache;
add_header Access-Control-Allow-Origin *;
}
......@@ -125,13 +118,13 @@ http {
application/vnd.apple.mpegurl m3u8;
video/mp2t ts;
}
add_header Cache-Control no-cache;
add_header Access-Control-Allow-Origin *;
}
location /stat {
rtmp_stat all;
rtmp_stat_stylesheet static/stat.xsl;
add_header Cache-Control no-cache;
}
location /static {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment