From 5cbb9aeb7249c51e7a6f4075695e0ca1ec9e0296 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 18 May 2022 16:57:57 +0200 Subject: l: move radio to subfolder --- lass/2configs/radio/default.nix | 504 ++++++++++++++++++++++++++++++++++++++++ lass/2configs/radio/news.nix | 120 ++++++++++ 2 files changed, 624 insertions(+) create mode 100644 lass/2configs/radio/default.nix create mode 100644 lass/2configs/radio/news.nix (limited to 'lass/2configs/radio') diff --git a/lass/2configs/radio/default.nix b/lass/2configs/radio/default.nix new file mode 100644 index 000000000..34115f56a --- /dev/null +++ b/lass/2configs/radio/default.nix @@ -0,0 +1,504 @@ +{ config, pkgs, ... }: +with pkgs.stockholm.lib; + +let + name = "radio"; + + 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 -Ev '/other/|/.graveyard/' \ + | grep '\.ogg$' \ + | shuf -n1 \ + | sed 's,${music_dir}/,,' \ + )" + ''; + + get_current_track_position = pkgs.writeDash "get_current_track_position" '' + ${pkgs.mpc_cli}/bin/mpc status | ${pkgs.gawk}/bin/awk '/^\[playing\]/ { sub(/\/.+/,"",$3); split($3,a,/:/); print a[1]*60+a[2] }' + ''; + + skip_track = pkgs.writeBashBin "skip_track" '' + set -eu + + ${add_random}/bin/add_random + music_dir=${escapeShellArg music_dir} + current_track=$(${pkgs.mpc_cli}/bin/mpc current -f %file%) + track_infos=$(${print_current}/bin/print_current) + skip_count=$(${pkgs.attr}/bin/getfattr -n user.skip_count --only-values "$music_dir"/"$current_track" || echo 0) + if [[ "$current_track" =~ ^the_playlist/music/.* ]] && [ "$skip_count" -le 2 ]; then + skip_count=$((skip_count+1)) + ${pkgs.attr}/bin/setfattr -n user.skip_count -v "$skip_count" "$music_dir"/"$current_track" + echo skipping: "$track_infos" skip_count: "$skip_count" + else + mkdir -p "$music_dir"/the_playlist/.graveyard/ + mv "$music_dir"/"$current_track" "$music_dir"/the_playlist/.graveyard/ + echo killing: "$track_infos" + fi + ${pkgs.mpc_cli}/bin/mpc -q next + ''; + + good_track = pkgs.writeBashBin "good_track" '' + set -eu + + music_dir=${escapeShellArg music_dir} + current_track=$(${pkgs.mpc_cli}/bin/mpc current -f %file%) + track_infos=$(${print_current}/bin/print_current) + if [[ "$current_track" =~ ^the_playlist/music/.* ]]; then + ${pkgs.attr}/bin/setfattr -n user.skip_count -v 0 "$music_dir"/"$current_track" + else + mv "$music_dir"/"$current_track" "$music_dir"/the_playlist/music/ || : + fi + echo good: "$track_infos" + ''; + + track_youtube_link = pkgs.writeDash "track_youtube_link" '' + ${pkgs.mpc_cli}/bin/mpc current -f %file% \ + | ${pkgs.gnused}/bin/sed 's@.*\(.\{11\}\)\.ogg@https://www.youtube.com/watch?v=\1@' + ''; + + print_current = pkgs.writeDashBin "print_current" '' + echo "$(${pkgs.mpc_cli}/bin/mpc current -f %file%) \ + $(${track_youtube_link})" + ''; + + print_current_json = pkgs.writeDashBin "print_current_json" '' + ${pkgs.jq}/bin/jq -n -c \ + --arg name "$(${pkgs.mpc_cli}/bin/mpc current)" \ + --arg artist "$(${pkgs.mpc_cli}/bin/mpc current -f %artist%)" \ + --arg title "$(${pkgs.mpc_cli}/bin/mpc current -f %title%)" \ + --arg filename "$(${pkgs.mpc_cli}/bin/mpc current -f %file%)" \ + --arg position "$(${get_current_track_position})" \ + --arg length "$(${pkgs.mpc_cli}/bin/mpc current -f %time%)" \ + --arg youtube "$(${track_youtube_link})" '{ + name: $name, + artist: $artist, + title: $title, + filename: $filename, + position: $position, + length: $length, + youtube: $youtube + }' + ''; + + set_irc_topic = pkgs.writeDash "set_irc_topic" '' + ${pkgs.curl}/bin/curl -fsS --unix-socket /home/radio/reaktor.sock http://z/ \ + -H content-type:application/json \ + -d "$(${pkgs.jq}/bin/jq -n \ + --arg text "$1" '{ + command:"TOPIC", + params:["#the_playlist",$text] + }' + )" + ''; + + write_to_irc = pkgs.writeDash "write_to_irc" '' + ${pkgs.curl}/bin/curl -fsSv --unix-socket /home/radio/reaktor.sock http://z/ \ + -H content-type:application/json \ + -d "$(${pkgs.jq}/bin/jq -n \ + --arg text "$1" '{ + command:"PRIVMSG", + params:["#the_playlist",$text] + }' + )" + ''; + +in { + imports = [ + ./news.nix + ]; + + users.users = { + "${name}" = rec { + inherit name; + createHome = mkForce false; + group = name; + uid = genid_uint31 name; + description = "radio manager"; + home = "/home/${name}"; + useDefaultShell = true; + openssh.authorizedKeys.keys = with config.krebs.users; [ + lass.pubkey + lass-mors.pubkey + ]; + }; + }; + + users.groups = { + "radio" = {}; + }; + + krebs.per-user.${name}.packages = with pkgs; [ + add_random + good_track + skip_track + print_current + print_current_json + ncmpcpp + mpc_cli + ]; + + services.mpd = { + enable = true; + user = "radio"; + musicDirectory = "${music_dir}"; + dataDir = "/home/radio/state"; # TODO create this somwhere + extraConfig = '' + log_level "default" + auto_update "yes" + volume_normalization "yes" + + audio_output { + type "httpd" + name "raw radio" + encoder "wave" + port "7900" + format "44100:16:2" + always_on "yes" # prevent MPD from disconnecting all listeners when playback is stopped. + tags "yes" # httpd supports sending tags to listening streams. + } + ''; + }; + services.liquidsoap.streams.radio-news = pkgs.writeText "radio-news.liq" '' + source = mksafe(input.http("http://localhost:7900/raw.wave")) + + output.icecast(mount = '/music.ogg', password = 'hackme', %vorbis(quality = 1), source) + output.icecast(mount = '/music.mp3', password = 'hackme', %mp3.vbr(), source) + output.icecast(mount = '/music.opus', password = 'hackme', %opus(bitrate = 64), source) + + extra_input = audio_to_stereo(input.harbor("live", port=1338)) + + o = smooth_add(normal = source, special = extra_input) + output.icecast(mount = '/radio.ogg', password = 'hackme', %vorbis(quality = 1), o) + output.icecast(mount = '/radio.mp3', password = 'hackme', %mp3.vbr(), o) + output.icecast(mount = '/radio.opus', password = 'hackme', %opus(bitrate = 64), o) + ''; + services.icecast = { + enable = true; + hostname = "radio.lassul.us"; + admin.password = "hackme"; + extraConf = '' + + hackme + + ''; + }; + + krebs.iptables = { + tables = { + filter.INPUT.rules = [ + { predicate = "-p tcp --dport 8000"; target = "ACCEPT"; } + { predicate = "-i retiolum -p tcp --dport 8001"; target = "ACCEPT"; } + ]; + }; + }; + + systemd.timers.radio = { + description = "radio autoadder timer"; + wantedBy = [ "timers.target" ]; + + timerConfig = { + OnCalendar = "*:0/1"; + }; + }; + + systemd.services.radio = let + autoAdd = pkgs.writeDash "autoAdd" '' + LIMIT=$1 #in seconds + + timeLeft () { + playlistDuration=$(${pkgs.mpc_cli}/bin/mpc --format '%time%' playlist | ${pkgs.gawk}/bin/awk -F ':' 'BEGIN{t=0} {t+=$1*60+$2} END{print t}') + currentTime=$(${get_current_track_position}) + expr ''${playlistDuration:-0} - ''${currentTime:-0} + } + + if test $(timeLeft) -le $LIMIT; then + ${add_random}/bin/add_random + fi + ${pkgs.mpc_cli}/bin/mpc play > /dev/null + ''; + in { + description = "radio playlist autoadder"; + after = [ "network.target" ]; + + restartIfChanged = true; + + serviceConfig = { + ExecStart = "${autoAdd} 150"; + }; + }; + + systemd.services.radio-recent = let + recentlyPlayed = pkgs.writeDash "recentlyPlayed" '' + set -xefu + LIMIT=1000 #how many tracks to keep in the history + HISTORY_FILE=/var/lib/radio/recent + while :; do + ${pkgs.mpc_cli}/bin/mpc idle player > /dev/null + ${pkgs.mpc_cli}/bin/mpc current -f %file% + done | while read track; do + + listeners=$(${pkgs.curl}/bin/curl lassul.us:8000/status-json.xsl | + ${pkgs.jq}/bin/jq '[.icestats.source[].listeners] | add') + echo "$(date -Is)" "$track" | tee -a "$HISTORY_FILE" + echo "$(tail -$LIMIT "$HISTORY_FILE")" > "$HISTORY_FILE" + ${set_irc_topic} "playing: $track listeners: $listeners" + done + ''; + in { + description = "radio recently played"; + after = [ "mpd.service" "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + restartIfChanged = true; + + serviceConfig = { + ExecStart = recentlyPlayed; + User = "radio"; + }; + }; + + # allow reaktor2 to modify files + systemd.services."reaktor2-the_playlist".serviceConfig.DynamicUser = mkForce false; + + krebs.reaktor2.the_playlist = { + hostname = "irc.hackint.org"; + port = "6697"; + useTLS = true; + nick = "the_playlist"; + username = "radio"; + API.listen = "unix:/home/radio/reaktor.sock"; + plugins = [ + { + plugin = "register"; + config = { + channels = [ + "#the_playlist" + "#krebs" + ]; + }; + } + { + plugin = "system"; + config = { + workdir = config.krebs.reaktor2.the_playlist.stateDir; + hooks.PRIVMSG = [ + { + activate = "match"; + pattern = "^(?:.*\\s)?\\s*the_playlist:\\s*([0-9A-Za-z._][0-9A-Za-z._-]*)(?:\\s+(.*\\S))?\\s*$"; + command = 1; + arguments = [2]; + commands = { + skip.filename = "${skip_track}/bin/skip_track"; + next.filename = "${skip_track}/bin/skip_track"; + bad.filename = "${skip_track}/bin/skip_track"; + + good.filename = "${good_track}/bin/good_track"; + nice.filename = "${good_track}/bin/good_track"; + like.filename = "${good_track}/bin/good_track"; + + current.filename = "${print_current}/bin/print_current"; + suggest.filename = pkgs.writeDash "suggest" '' + echo "$@" >> playlist_suggest + ''; + }; + } + ]; + }; + } + ]; + }; + + krebs.htgen.radio = { + port = 8001; + user = { + name = "radio"; + }; + script = ''. ${pkgs.writeDash "radio" '' + case "$Method $Request_URI" in + "GET /current") + printf 'HTTP/1.1 200 OK\r\n' + printf 'Connection: close\r\n' + printf '\r\n' + ${print_current_json}/bin/print_current_json + exit + ;; + "POST /skip") + printf 'HTTP/1.1 200 OK\r\n' + printf 'Connection: close\r\n' + printf '\r\n' + msg=$(${skip_track}/bin/skip_track) + ${write_to_irc} "$msg" + echo "$msg" + exit + ;; + "POST /good") + printf 'HTTP/1.1 200 OK\r\n' + printf 'Connection: close\r\n' + printf '\r\n' + msg=$(${good_track}/bin/good_track) + ${write_to_irc} "$msg" + echo "$msg" + exit + ;; + esac + ''}''; + }; + + services.nginx = { + enable = true; + virtualHosts."radio.lassul.us" = { + forceSSL = true; + enableACME = true; + locations."/".extraConfig = '' + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Server $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_pass http://localhost:8000; + ''; + locations."= /recent".extraConfig = '' + default_type "text/plain"; + alias /var/lib/radio/recent; + ''; + locations."= /current".extraConfig = '' + proxy_pass http://localhost:8001; + ''; + locations."= /skip".extraConfig = '' + proxy_pass http://localhost:8001; + ''; + locations."= /good".extraConfig = '' + proxy_pass http://localhost:8001; + ''; + locations."= /radio.sh".extraConfig = '' + alias ${pkgs.writeScript "radio.sh" '' + #!/bin/sh + while sleep 1; do + mpv \ + --cache-secs=0 --demuxer-readahead-secs=0 --untimed --cache-pause=no \ + 'http://lassul.us:8000/radio.opus' + done + ''}; + ''; + locations."= /controls".extraConfig = '' + default_type "text/html"; + alias ${pkgs.writeText "controls.html" '' + + + + + + + + The_Playlist Voting! + + + + + +
+ + + +
+ Currently Running:
+ +
+
+
+ +
+ + + + + ''}; + ''; + extraConfig = '' + add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + ''; + }; + virtualHosts."lassul.us".locations."= /the_playlist".extraConfig = let + html = pkgs.writeText "index.html" '' + + + + + lassulus playlist + + +
+ +
+
+ +
+ + + + ''; + in '' + default_type "text/html"; + alias ${html}; + ''; + }; + services.syncthing.declarative.folders."the_playlist" = { + path = "/home/radio/music/the_playlist"; + devices = [ "mors" "phone" "prism" "omo" ]; + }; + krebs.acl."/home/radio/music/the_playlist"."u:syncthing:X".parents = true; + krebs.acl."/home/radio/music/the_playlist"."u:syncthing:rwX" = {}; + krebs.acl."/home/radio/music/the_playlist"."u:radio:rwX" = {}; +} diff --git a/lass/2configs/radio/news.nix b/lass/2configs/radio/news.nix new file mode 100644 index 000000000..4f88197cb --- /dev/null +++ b/lass/2configs/radio/news.nix @@ -0,0 +1,120 @@ +{ config, lib, pkgs, ... }: +let + weather_report = pkgs.writers.writeDashBin "weather_report" '' + set -efu + export PATH="${lib.makeBinPath [ + pkgs.iproute2 + pkgs.coreutils + pkgs.jq + pkgs.curl + pkgs.gnugrep + pkgs.gnused + ]}" + ss -Hno state established 'sport = :8000' | + grep '^tcp' | sed 's/.*\[.*\].*\[\(::ffff:\)\{0,1\}\(.*\)\].*/\2/' | + sed '/127.0.0.1/d;/:/d' | + while read -r ip; do + curl -sSL "https://wttr.in/@$ip?format=j1" + done | jq -rs 'unique_by(.nearest_area[0].areaName[0].value) | + map((.nearest_area[0] | + "Weather report for \(.areaName[0].value), \(.country[0].value).") + + (.current_condition[0] | + " Currently it is \(.weatherDesc[0].value) outside with a temperature of \(.temp_C) degrees." + ) + ) | unique | .[]' + ' + ''; + send_to_radio = pkgs.writers.writeDashBin "send_to_radio" '' + ${pkgs.vorbisTools}/bin/oggenc - | + ${pkgs.libshout}/bin/shout --format ogg --host localhost --port 1338 --mount /live + ''; + + gc_news = pkgs.writers.writeDashBin "gc_news" '' + set -xefu + ${pkgs.coreutils}/bin/cat $HOME/news | ${pkgs.jq}/bin/jq -cs 'map(select((.to|fromdateiso8601) > now)) | .[]' > $HOME/bla-news.tmp + ${pkgs.coreutils}/bin/mv $HOME/bla-news.tmp $HOME/news + ''; + + get_current_news = pkgs.writers.writeDashBin "get_current_news" '' + set -xefu + ${pkgs.coreutils}/bin/cat $HOME/news | ${pkgs.jq}/bin/jq -rs 'map(select(((.to | fromdateiso8601) > now) and (.from|fromdateiso8601) < now) | .text) | .[]' + ''; + + newsshow = pkgs.writers.writeDashBin "newsshow" /* sh */ '' + cat << EOF + hello crabpeople! + $(${pkgs.ddate}/bin/ddate +'Today is %{%A, the %e of %B%}, %Y. %N%nCelebrate %H') + It is $(date --utc +%H) o clock UTC. + todays news: + $(get_current_news) + $(gc_news) + $(weather_report) + EOF + ''; +in +{ + systemd.services.newsshow = { + path = [ + newsshow + send_to_radio + gc_news + get_current_news + weather_report + pkgs.curl + pkgs.retry + ]; + script = '' + set -efu + retry -t 5 -d 10 -- newsshow | + retry -t 5 -d 10 -- curl -fSsG http://tts.r/api/tts --data-urlencode 'text@-' | + retry -t 5 -d 10 -- send_to_radio + ''; + startAt = "*:00:00"; + serviceConfig = { + User = "radio-news"; + }; + }; + + krebs.iptables.tables.filter.INPUT.rules = [ + { predicate = "-p tcp --dport 7999"; target = "ACCEPT"; } + ]; + + krebs.htgen.news = { + port = 7999; + user = { + name = "radio-news"; + }; + script = ''. ${pkgs.writers.writeDash "htgen-news" '' + set -xefu + case "''${Method:-GET} $Request_URI" in + "GET /") + printf 'HTTP/1.1 200 OK\r\n' + printf 'Access-Control-Allow-Origin: *\r\n'; + printf 'Access-Control-Allow-Methods: GET, POST, OPTIONS\r\n'; + printf 'Connection: close\r\n' + printf '\r\n' + cat "$HOME"/news | jq -sc . + exit + ;; + "POST /") + payload=$(head -c "$req_content_length") + echo "$payload" | jq 'has("from") and has("to") and has("text")' >&2 + echo "$payload" | jq -c '{ from: (.from | fromdate | todate), to: (.to | fromdate | todate), text: .text }' >> "$HOME"/news + printf 'HTTP/1.1 200 OK\r\n' + printf 'Access-Control-Allow-Origin: *\r\n'; + printf 'Access-Control-Allow-Methods: GET, POST, OPTIONS\r\n'; + printf 'Connection: close\r\n' + printf '\r\n' + exit + ;; + esac + ''}''; + }; + + ## debug + # environment.systemPackages = [ + # weather_report + # send_to_radio + # newsshow + # ]; +} -- cgit v1.2.3 From ca1621c17f867d006c4c394b3be046d42a6c5c7d Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 18 May 2022 17:22:07 +0200 Subject: l radio: rate limit downvotes --- lass/2configs/radio/controls.html | 83 +++++++++++++++++++++++++++++++++++++++ lass/2configs/radio/default.nix | 81 +------------------------------------- 2 files changed, 84 insertions(+), 80 deletions(-) create mode 100644 lass/2configs/radio/controls.html (limited to 'lass/2configs/radio') diff --git a/lass/2configs/radio/controls.html b/lass/2configs/radio/controls.html new file mode 100644 index 000000000..858dc3656 --- /dev/null +++ b/lass/2configs/radio/controls.html @@ -0,0 +1,83 @@ + + + + + + + + The_Playlist Voting! + + + + + +
+ + + +
+ Currently Running:
+ +
+
+
+ +
+ + + + diff --git a/lass/2configs/radio/default.nix b/lass/2configs/radio/default.nix index 34115f56a..a1e220cdb 100644 --- a/lass/2configs/radio/default.nix +++ b/lass/2configs/radio/default.nix @@ -384,86 +384,7 @@ in { ''; locations."= /controls".extraConfig = '' default_type "text/html"; - alias ${pkgs.writeText "controls.html" '' - - - - - - - - The_Playlist Voting! - - - - - -
- - - -
- Currently Running:
- -
-
-
- -
- - - - - ''}; + alias ${./controls.html}; ''; extraConfig = '' add_header 'Access-Control-Allow-Origin' '*'; -- cgit v1.2.3 From 5befc5a6f260e2283863212b39749d5ed05afb63 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 19 May 2022 19:16:09 +0200 Subject: l radio news: use openweather api --- lass/2configs/radio/news.nix | 25 +++++++++++++------------ lass/2configs/radio/weather_for_ips.py | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 lass/2configs/radio/weather_for_ips.py (limited to 'lass/2configs/radio') diff --git a/lass/2configs/radio/news.nix b/lass/2configs/radio/news.nix index 4f88197cb..6d73f4bb7 100644 --- a/lass/2configs/radio/news.nix +++ b/lass/2configs/radio/news.nix @@ -1,29 +1,27 @@ { config, lib, pkgs, ... }: let + weather_for_ips = pkgs.writers.writePython3Bin "weather_for_ips" { + libraries = [ pkgs.python3Packages.geoip2 ]; + } ./weather_for_ips.py; + weather_report = pkgs.writers.writeDashBin "weather_report" '' set -efu export PATH="${lib.makeBinPath [ pkgs.iproute2 pkgs.coreutils - pkgs.jq pkgs.curl pkgs.gnugrep pkgs.gnused ]}" + curl -z /tmp/GeoLite2-City.mmdb -o /tmp/GeoLite2-City.mmdb http://c.r/GeoLite2-City.mmdb + MAXMIND_GEOIP_DB="/tmp/GeoLite2-City.mmdb"; export MAXMIND_GEOIP_DB + OPENWEATHER_API_KEY=$(cat "$CREDENTIALS_DIRECTORY/openweather_api"); export OPENWEATHER_API_KEY ss -Hno state established 'sport = :8000' | grep '^tcp' | sed 's/.*\[.*\].*\[\(::ffff:\)\{0,1\}\(.*\)\].*/\2/' | - sed '/127.0.0.1/d;/:/d' | - while read -r ip; do - curl -sSL "https://wttr.in/@$ip?format=j1" - done | jq -rs 'unique_by(.nearest_area[0].areaName[0].value) | - map((.nearest_area[0] | - "Weather report for \(.areaName[0].value), \(.country[0].value).") - + (.current_condition[0] | - " Currently it is \(.weatherDesc[0].value) outside with a temperature of \(.temp_C) degrees." - ) - ) | unique | .[]' - ' + sed '/127.0.0.1/d;/::1/d' | + ${weather_for_ips}/bin/weather_for_ips ''; + send_to_radio = pkgs.writers.writeDashBin "send_to_radio" '' ${pkgs.vorbisTools}/bin/oggenc - | ${pkgs.libshout}/bin/shout --format ogg --host localhost --port 1338 --mount /live @@ -72,6 +70,9 @@ in startAt = "*:00:00"; serviceConfig = { User = "radio-news"; + LoadCredential = [ + "openweather_api:${toString }/openweather_api_key" + ]; }; }; diff --git a/lass/2configs/radio/weather_for_ips.py b/lass/2configs/radio/weather_for_ips.py new file mode 100644 index 000000000..8d9a2e7bc --- /dev/null +++ b/lass/2configs/radio/weather_for_ips.py @@ -0,0 +1,33 @@ +import geoip2.database +import fileinput +import json +import requests +import os + + +geoip = geoip2.database.Reader(os.environ['MAXMIND_GEOIP_DB']) +seen = {} +output = [] +for ip in fileinput.input(): + location = geoip.city(ip.strip()) + if location.city.geoname_id not in seen: + seen[location.city.geoname_id] = True + weather_api_key = os.environ['OPENWEATHER_API_KEY'] + url = ( + f'https://api.openweathermap.org/data/2.5/onecall' + f'?lat={location.location.latitude}' + f'&lon={location.location.longitude}' + f'&appid={weather_api_key}' + f'&units=metric' + ) + resp = requests.get(url) + weather = json.loads(resp.text)['current'] + output.append( + f'Weather report for {location.city.name}' + f', {location.country.name}. ' + f'Currently it is {weather["weather"][0]["description"]} outside ' + f'with a temperature of {weather["temp"]} degrees ' + f'and a windspeed of {weather["wind_speed"]} meter per second. ' + ) + +print('\n'.join(output)) -- cgit v1.2.3 From 3b46460fe9f54c1ca06af31cfe715c0cb51ce1c3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 22 May 2022 20:51:14 +0200 Subject: l radio: use jc instead of sed/grep --- lass/2configs/radio/default.nix | 16 +++++++--------- lass/2configs/radio/news.nix | 16 ++++++++++------ 2 files changed, 17 insertions(+), 15 deletions(-) (limited to 'lass/2configs/radio') diff --git a/lass/2configs/radio/default.nix b/lass/2configs/radio/default.nix index a1e220cdb..0611be7ce 100644 --- a/lass/2configs/radio/default.nix +++ b/lass/2configs/radio/default.nix @@ -372,15 +372,13 @@ in { locations."= /good".extraConfig = '' proxy_pass http://localhost:8001; ''; - locations."= /radio.sh".extraConfig = '' - alias ${pkgs.writeScript "radio.sh" '' - #!/bin/sh - while sleep 1; do - mpv \ - --cache-secs=0 --demuxer-readahead-secs=0 --untimed --cache-pause=no \ - 'http://lassul.us:8000/radio.opus' - done - ''}; + locations."= /radio.sh".alias = pkgs.writeScript "radio.sh" '' + #!/bin/sh + while sleep 1; do + mpv \ + --cache-secs=0 --demuxer-readahead-secs=0 --untimed --cache-pause=no \ + 'http://lassul.us:8000/radio.opus' + done ''; locations."= /controls".extraConfig = '' default_type "text/html"; diff --git a/lass/2configs/radio/news.nix b/lass/2configs/radio/news.nix index 6d73f4bb7..a3b39a9ea 100644 --- a/lass/2configs/radio/news.nix +++ b/lass/2configs/radio/news.nix @@ -7,18 +7,22 @@ let weather_report = pkgs.writers.writeDashBin "weather_report" '' set -efu export PATH="${lib.makeBinPath [ - pkgs.iproute2 pkgs.coreutils pkgs.curl - pkgs.gnugrep - pkgs.gnused + pkgs.iproute2 + pkgs.jc + pkgs.jq ]}" curl -z /tmp/GeoLite2-City.mmdb -o /tmp/GeoLite2-City.mmdb http://c.r/GeoLite2-City.mmdb MAXMIND_GEOIP_DB="/tmp/GeoLite2-City.mmdb"; export MAXMIND_GEOIP_DB OPENWEATHER_API_KEY=$(cat "$CREDENTIALS_DIRECTORY/openweather_api"); export OPENWEATHER_API_KEY - ss -Hno state established 'sport = :8000' | - grep '^tcp' | sed 's/.*\[.*\].*\[\(::ffff:\)\{0,1\}\(.*\)\].*/\2/' | - sed '/127.0.0.1/d;/::1/d' | + ss -no 'sport = :8000' | + jc --ss | jq -r '.[] | + select( + .local_address != "[::ffff:127.0.0.1]" + and .local_address != "[::1]" + ) | .peer_address | gsub("[\\[\\]]"; "") + ' | ${weather_for_ips}/bin/weather_for_ips ''; -- cgit v1.2.3 From 1c02415b6e95c0fbb920fd2bfb5f4b975f1c7fbe Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 25 May 2022 14:59:08 +0200 Subject: l radio: add radio-news.r alias --- lass/2configs/radio/news.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lass/2configs/radio') diff --git a/lass/2configs/radio/news.nix b/lass/2configs/radio/news.nix index a3b39a9ea..5c6c5d33a 100644 --- a/lass/2configs/radio/news.nix +++ b/lass/2configs/radio/news.nix @@ -84,6 +84,16 @@ in { predicate = "-p tcp --dport 7999"; target = "ACCEPT"; } ]; + services.nginx.virtualHosts."radio-news.r" = { + locations."/" = { + proxyPass = "http://localhost:7999"; + proxyWebsockets = true; + extraConfig = '' + add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + ''; + }; + }; krebs.htgen.news = { port = 7999; user = { -- cgit v1.2.3 From d9b09371ecd31e35bd8bbd1d9e929237e52132b1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 25 May 2022 17:42:56 +0200 Subject: l radio news: remove duplicate CORS headers --- lass/2configs/radio/news.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'lass/2configs/radio') diff --git a/lass/2configs/radio/news.nix b/lass/2configs/radio/news.nix index 5c6c5d33a..80e5f9cc8 100644 --- a/lass/2configs/radio/news.nix +++ b/lass/2configs/radio/news.nix @@ -104,8 +104,6 @@ in case "''${Method:-GET} $Request_URI" in "GET /") printf 'HTTP/1.1 200 OK\r\n' - printf 'Access-Control-Allow-Origin: *\r\n'; - printf 'Access-Control-Allow-Methods: GET, POST, OPTIONS\r\n'; printf 'Connection: close\r\n' printf '\r\n' cat "$HOME"/news | jq -sc . @@ -116,8 +114,6 @@ in echo "$payload" | jq 'has("from") and has("to") and has("text")' >&2 echo "$payload" | jq -c '{ from: (.from | fromdate | todate), to: (.to | fromdate | todate), text: .text }' >> "$HOME"/news printf 'HTTP/1.1 200 OK\r\n' - printf 'Access-Control-Allow-Origin: *\r\n'; - printf 'Access-Control-Allow-Methods: GET, POST, OPTIONS\r\n'; printf 'Connection: close\r\n' printf '\r\n' exit -- cgit v1.2.3 From e92a58fe0f4edbf047ff4dd89866ae0991d37350 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 25 May 2022 17:44:56 +0200 Subject: l radio news: don't expose htgen directly --- lass/2configs/radio/news.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'lass/2configs/radio') diff --git a/lass/2configs/radio/news.nix b/lass/2configs/radio/news.nix index 80e5f9cc8..27b124093 100644 --- a/lass/2configs/radio/news.nix +++ b/lass/2configs/radio/news.nix @@ -80,10 +80,6 @@ in }; }; - krebs.iptables.tables.filter.INPUT.rules = [ - { predicate = "-p tcp --dport 7999"; target = "ACCEPT"; } - ]; - services.nginx.virtualHosts."radio-news.r" = { locations."/" = { proxyPass = "http://localhost:7999"; -- cgit v1.2.3