summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/nixpkgs.json6
-rw-r--r--lass/2configs/radio.nix26
2 files changed, 28 insertions, 4 deletions
diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 123d624d8..43dc0ddfa 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,7 +1,7 @@
{
"url": "https://github.com/NixOS/nixpkgs-channels",
- "rev": "598a9cbed6348ebda43c6b1a9a3061e0206297e7",
- "date": "2020-03-28T03:06:32+01:00",
- "sha256": "12m910j2sfhm3a6skw4janxy010gzdxp15bn8v9w7w9hhjzvdw8c",
+ "rev": "f6c1d3b113ce9e7c908991df2e8eed02f03df1bc",
+ "date": "2020-04-14T08:34:46-04:00",
+ "sha256": "08z6qbjmx64bcil3cnvflb7bv9ibdizxcr63yvhgcqzsja7m51n5",
"fetchSubmodules": false
}
diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index c4c4b0abb..9da0a499c 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -12,7 +12,7 @@ let
music_dir = "/home/radio/music";
add_random = pkgs.writeDashBin "add_random" ''
- ${pkgs.mpc_cli}/bin/mpc add "$(${pkgs.findutils}/bin/find "${music_dir}/the_playlist" | grep '\.ogg$' | shuf -n1 | sed 's,${music_dir}/,,')"
+ ${pkgs.mpc_cli}/bin/mpc add "$(${pkgs.findutils}/bin/find "${music_dir}/the_playlist" | grep -v '/other/' | grep '\.ogg$' | shuf -n1 | sed 's,${music_dir}/,,')"
'';
skip_track = pkgs.writeBashBin "skip_track" ''
@@ -146,6 +146,7 @@ in {
tables = {
filter.INPUT.rules = [
{ predicate = "-p tcp --dport 8000"; target = "ACCEPT"; }
+ { predicate = "-i retiolum -p tcp --dport 8001"; target = "ACCEPT"; }
];
};
};
@@ -259,6 +260,29 @@ in {
];
};
+ krebs.htgen.radio = {
+ port = 8001;
+ user = {
+ name = "radio";
+ };
+ script = ''
+ case "$Method $Request_URI" in
+ "POST /skip")
+ ${skip_track}/bin/skip_track
+ exit
+ ;;
+ "POST /good")
+ ${good_track}/bin/good_track
+ exit
+ ;;
+ "POST /current")
+ ${print_current}/bin/print_current
+ exit
+ ;;
+ esac
+ '';
+ };
+
services.nginx = {
enable = true;
virtualHosts."radio.lassul.us" = {