Merge branch 'develop' into web-player
commit
a75a625cd3
|
@ -69,4 +69,4 @@ twitch_mirror:
|
||||||
enabled: false
|
enabled: false
|
||||||
# https://stream.twitch.tv/ingests/
|
# https://stream.twitch.tv/ingests/
|
||||||
# do not include {stream_key}
|
# do not include {stream_key}
|
||||||
ingest: 'rtmp://live-ord02.twitch.tv/app/
|
ingest: 'rtmp://live-ord02.twitch.tv/app/'
|
|
@ -18,6 +18,10 @@ server {
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~* \.(mpd|m4s|mp4)$ {
|
location ~* \.(mpd|m4s|mp4)$ {
|
||||||
|
add_header 'Access-Control-Allow-Origin' '*';
|
||||||
|
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
|
||||||
|
add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
|
||||||
|
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
|
||||||
# nginx can serve static files faster than node
|
# nginx can serve static files faster than node
|
||||||
# this should improve performance
|
# this should improve performance
|
||||||
root /opt/satyr/site/;
|
root /opt/satyr/site/;
|
||||||
|
|
|
@ -4,6 +4,6 @@ import { config } from "./config";
|
||||||
|
|
||||||
async function run() {
|
async function run() {
|
||||||
await initDB();
|
await initDB();
|
||||||
await clean(false);
|
await clean();
|
||||||
}
|
}
|
||||||
run().then(() => {process.exit()});
|
run().then(() => {process.exit()});
|
|
@ -52,8 +52,8 @@
|
||||||
<div>
|
<div>
|
||||||
<div>
|
<div>
|
||||||
<b>Satyr</b></br>
|
<b>Satyr</b></br>
|
||||||
<a href="https://gitlab.com/knotteye/satyr">About</a></br>
|
<a href="https://pond.waldn.net/git/knotteye/satyr">About</a></br>
|
||||||
<a href="https://gitlab.com/knotteye/satyr/-/releases">v{{ version }}</a>
|
<a href="https://pond.waldn.net/git/knotteye/satyr/releases">v{{ version }}</a>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<img src="/logo.svg" height="50" />
|
<img src="/logo.svg" height="50" />
|
||||||
|
|
Reference in New Issue