From 1cbf2463946f1ec139b8d9973d133099cca79fa9 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 16 Apr 2020 09:12:30 +0200 Subject: [PATCH] web: fix config --- systems/LoutreOS/web.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/systems/LoutreOS/web.nix b/systems/LoutreOS/web.nix index b639fc7..a8f3399 100644 --- a/systems/LoutreOS/web.nix +++ b/systems/LoutreOS/web.nix @@ -161,10 +161,10 @@ in alias = "/var/www/site-musique/media/"; }; }; - "maxspiegel.fr" = base { "/" = { root = "/run/python-ci/nyanloutre/site-max"; }; + "maxspiegel.fr" = base { "/" = { root = "/run/python-ci/nyanloutre/site-max"; }; }; "stream.nyanlout.re" = base { "/" = { - root = "/var/www/hls/" + root = "/var/www/hls/"; extraConfig = '' add_header Cache-Control no-cache; add_header Access-Control-Allow-Origin *; @@ -185,7 +185,9 @@ in "ci.nyanlout.re" = simpleReverse 52350; "gitea.nyanlout.re" = simpleReverse config.services.gitea.httpPort; }; - appendConfig = '' + appendConfig = let + rootLocation = config.services.nginx.virtualHosts."stream.nyanlout.re".locations."/".root; + in '' rtmp { server { listen 1935; @@ -196,14 +198,14 @@ in exec_push ${pkgs.ffmpeg}/bin/ffmpeg -i rtmp://localhost/$app/$name -async 1 -vsync -1 -c:v libx264 -c:a aac -b:v 768k -b:a 96k -vf "scale=720:trunc(ow/a/2)*2" -tune zerolatency -preset ultrafast -crf 28 -f flv rtmp://localhost/show/$name_mid -c:v libx264 -c:a aac -b:v 1024k -b:a 128k -vf "scale=960:trunc(ow/a/2)*2" -tune zerolatency -preset ultrafast -crf 28 -f flv rtmp://localhost/show/$name_high - -c copy -f flv rtmp://localhost/show/$name_src 2>>${config.services.nginx.virtualHosts."stream.nyanlout.re".root}/ffmpeg-$name.log; + -c copy -f flv rtmp://localhost/show/$name_src 2>>${rootLocation}/ffmpeg-$name.log; } application show { live on; hls on; - hls_path ${config.services.nginx.virtualHosts."stream.nyanlout.re".root}; + hls_path ${rootLocation}; hls_fragment 3s; hls_playlist_length 60s;