kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-16 18:21:07 +01:00
Code Releases Activity

feat: add serveHtml helper

Browse Source
This commit is contained in:
Kierán Meinhardt
2021-10-11 20:02:17 +02:00
parent f6ffd477d1
commit 2384a4eef5
3 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
configs/bvg.nix
View File

@@ -1,11 +1,12 @@
{ pkgs, lib, ... }:
let
inherit (import <niveum/lib>) serveHtml;
stations = [
900068204 # A/M
900068302 # KAS
900068203 # B-P
];
fahrplanHtml = ''
fahrplan = pkgs.writeText "fahrplan.html" ''
<!DOCTYPE html>
<title>Fahrplan</title>
<link
@@ -51,10 +52,6 @@ in
};
services.nginx.virtualHosts."bvg.kmein.r" = {
locations."/".extraConfig = ''
default_type "text/html";
root ${pkgs.linkFarm "fahrplan" [{ name = "index.html"; path = pkgs.writeText "fahrplan.html" fahrplanHtml; }]};
index index.html;
'';
locations."/".extraConfig = serveHtml fahrplan pkgs;
};
}

14
configs/radio/default.nix
View File

@@ -1,6 +1,6 @@
{ lib, pkgs, config, ... }:
let
inherit (import <niveum/lib>) tmpfilesConfig;
inherit (import <niveum/lib>) tmpfilesConfig serveHtml;
radioStore = "/var/lib/radio";
htgenPort = 8080;
@@ -197,17 +197,7 @@ in
forceSSL = true;
locations = lib.mkMerge (
[
{
"/".extraConfig = ''
default_type "text/html";
root ${pkgs.linkFarm "station-list" [{
name = "index.html";
path = import ./station-list.nix { inherit pkgs lib stations; };
}]};
index index.html;
'';
# skip
}
{ "/".extraConfig = serveHtml (import ./station-list.nix { inherit pkgs lib stations; }) pkgs; }
] ++ (lib.mapAttrsToList (name: station: {
"= /${name}/status".proxyPass = "http://127.0.0.1:${toString htgenPort}";
"= /${name}/listen.ogg".proxyPass = "http://127.0.0.1:${toString station.streamPort}";