From ea59935e5f57dfc03db3367f187ffaffafcc67a2 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 23 Jan 2021 19:06:07 +0100
Subject: l radio: simplify listeners counting

---
 lass/2configs/radio.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs/radio.nix')

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index 8c95b535..6a020692 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -200,7 +200,7 @@ in {
         ${pkgs.mpc_cli}/bin/mpc idle player > /dev/null
         ${pkgs.mpc_cli}/bin/mpc current -f %file%
       done | while read track; do
-        listeners=$(${pkgs.iproute}/bin/ss -Hno state established '( sport = :8000 )' | wc -l)
+        listeners=$(${pkgs.iproute}/bin/ss -Hno state established 'sport = :8000' | wc -l)
         echo "$(date -Is)" "$track" | tee -a "$HISTORY_FILE"
         echo "$(tail -$LIMIT "$HISTORY_FILE")" > "$HISTORY_FILE"
         ${write_to_irc} "playing: $track listeners: $listeners"
-- 
cgit v1.2.3


From 348d5e476f0689f40c14b566c078c26ef6222676 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 23 Jan 2021 19:06:20 +0100
Subject: l radio: import htgen script

---
 lass/2configs/radio.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lass/2configs/radio.nix')

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index 6a020692..707cc845 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -275,7 +275,7 @@ in {
     user = {
       name = "radio";
     };
-    script = ''
+    script = ''. ${pkgs.writeDash "radio" ''
       case "$Method $Request_URI" in
         "GET /current")
           printf 'HTTP/1.1 200 OK\r\n'
@@ -303,7 +303,7 @@ in {
           exit
         ;;
       esac
-    '';
+    ''}'';
   };
 
   services.nginx = {
-- 
cgit v1.2.3