knotteye
/
satyr
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 5 Wiki Activity

Merge branch 'develop' into web-player

pull/8/head
knotteye 2020-10-25 10:27:29 -05:00
parent 7b5a498241 fe3ec1bd75
commit a75a625cd3
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install/config.example.yml
View File

@ -69,4 +69,4 @@ twitch_mirror:
enabled: false
# https://stream.twitch.tv/ingests/
# do not include {stream_key}
ingest: 'rtmp://live-ord02.twitch.tv/app/
ingest: 'rtmp://live-ord02.twitch.tv/app/'

4
install/satyr.nginx
View File

@ -18,6 +18,10 @@ server {
}
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
# this should improve performance
root /opt/satyr/site/;

2
src/migrate.ts
View File

@ -4,6 +4,6 @@ import { config } from "./config";
async function run() {
await initDB();
await clean(false);
await clean();
}
run().then(() => {process.exit()});

4
templates/base.njk
View File

@ -52,8 +52,8 @@
<div>
<div>
<b>Satyr</b></br>
<a href="https://gitlab.com/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">About</a></br>
<a href="https://pond.waldn.net/git/knotteye/satyr/releases">v{{ version }}</a>
</div>
<div>
<img src="/logo.svg" height="50" />