diff --git a/configs/radio/default.nix b/configs/radio/default.nix index f09b399..51d042d 100644 --- a/configs/radio/default.nix +++ b/configs/radio/default.nix @@ -5,15 +5,6 @@ let radioStore = "/var/lib/radio"; htgenPort = 8080; stations = { - meddl = { - streamPort = 8000; - mpdPort = 6600; - description = '' - Drachenlord-Radio. Kopie von Hit Radio Antenne ASB, dem Anti-Mobbing-Sender. - Hier wird nicht nur, aber auch Meddl gespielt. - Für dich On Air einer unserer Top Moderatoren Rainer Winkler. Als einer der größten Meddler aller Zeiten, hat er sich schon in seiner Kinheit einen Namen gemacht. Auch wenn er dem Meddl zugeneigt ist und HipHop-Kaschber eigentlich hasst, spielt er mittlerweile gelegentlich auch Techno oder HipHop. - ''; - }; lyrikline = { streamPort = 8001; mpdPort = 6601; @@ -113,25 +104,6 @@ in )" url="$(cat ${radioStore}/$hash)" - echo "" - exit - ;; - "POST /meddl/skip") - send200 - ${mpcs.meddl}/bin/mpc-meddl next - exit - ;; - "GET /meddl/status") - send200 - - hash="$( - ${mpcs.meddl}/bin/mpc-meddl status -f '%file%' \ - | head -n 1 \ - | md5sum \ - | cut -d' ' -f 1 - )" - url="$(cat ${radioStore}/$hash)" - echo "" exit ;; @@ -220,40 +192,6 @@ in }; - systemd.services.meddl = { - after = [ "container@meddl.service" ]; - wantedBy = [ "container@meddl.service" ]; - startAt = "*:00/10"; - serviceConfig.User = config.users.extraUsers.radio.name; - preStart = "${mpcs.meddl}/bin/mpc-meddl crop || :"; - script = '' - set -efu - host=http://antenne-asb.ga - - prepend_host() { - sed "s#^#$host/#" - } - - ${pkgs.curl}/bin/curl -sSL "$host" \ - | ${pkgs.pup}/bin/pup 'li a attr{href}' \ - | prepend_host \ - | while read -r song; do - song_url="$(${pkgs.curl}/bin/curl -sSL "$song" \ - | ${pkgs.pup}/bin/pup 'audio source attr{src}' \ - | prepend_host - )" - - hash="$(echo "$song_url" | md5sum | cut -d' ' -f 1)" - echo "$song_url ($hash) -> $song" - echo "$song" > "${radioStore}/$hash" - - ${mpcs.meddl}/bin/mpc-meddl add "$song_url" - done - - ${mpcs.meddl}/bin/mpc-meddl play - ''; - }; - services.nginx.virtualHosts."radio.xn--kiern-0qa.de" = { enableACME = true; forceSSL = true; @@ -269,7 +207,6 @@ in index index.html; ''; # skip - "= /meddl/skip".proxyPass = "http://127.0.0.1:${toString htgenPort}"; } ] ++ (lib.mapAttrsToList (name: station: { "= /${name}/status".proxyPass = "http://127.0.0.1:${toString htgenPort}"; diff --git a/lib/streams.nix b/lib/streams.nix index 1ecc5c1..6b703bd 100644 --- a/lib/streams.nix +++ b/lib/streams.nix @@ -49,12 +49,6 @@ in [ logo = "http://lassul.us/art/portraits/selbstportrait.jpg"; desc = "Diminutive from lassus (“weary, faint, tired”). A programming human. Doing superior professional art."; } - { - stream = "https://radio.xn--kiern-0qa.de/meddl/listen.ogg"; - station = "Meddl"; - logo = "https://antenne-asb.ga/logo.png"; - desc = "Forked from antenne-asb.ga: Radiosender zum Youtuber Drachenlord. Hier läuft den ganzen Tag Drachenlord Musik von Haidern oder Podcasts zum Lord."; - } { stream = "https://radio.xn--kiern-0qa.de/lyrik/listen.ogg"; station = "Lyrik";