diff --git a/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix b/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix index f3a56cd..ecc2ac7 100644 --- a/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix +++ b/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix @@ -1,32 +1,30 @@ { pkgs, config, ... }: { - services.liquidsoap.streams = { - jimbops = pkgs.writeText "liquidjim" '' - settings.log.stdout.set(true) - settings.init.allow_root.set(true) - settings.scheduler.fast_queues.set(2) - - jimbops = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/JimboNFS/Music/JimBops")) - jimbops_fallback = fallback([jimbops, jimbops]) - - output.icecast( - %ffmpeg(format="ogg", %audio(codec="libvorbis", samplerate=48000, b="256k", channels=2)), - host="127.0.0.1", - port=265, - password="${config.secrets.castSourcePass}", - encoding = "UTF-8", + services.liquidsoap.streams.jimbops = pkgs.writeText "liquidstream1" '' + settings.log.stdout.set(true) + settings.init.allow_root.set(true) + settings.scheduler.fast_queues.set(2) + + jimbops = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/JimboNFS/Music/JimBops")) + jimbops_fallback = fallback([jimbops, jimbops]) + + output.icecast( + %ffmpeg(format="ogg", %audio(codec="libvorbis", samplerate=48000, b="256k", channels=2)), + host="127.0.0.1", + port=265, + password="${config.secrets.castSourcePass}", + encoding = "UTF-8", - radio="JimBops Radio", - genre = "Anything", - description="Music gathered by me, Jimbo.", - website="https://icecast.${config.domains.jim1}", - url="https://icecast.${config.domains.jim1}/jimbops.opus", - mount="jimbops.opus", - icy_metadata=["artist", "title"], - public=true, + radio="JimBops Radio", + genre = "Anything", + description="Music gathered by me, Jimbo.", + website="https://icecast.${config.domains.jim1}", + url="https://icecast.${config.domains.jim1}/jimbops.opus", + mount="jimbops.opus", + icy_metadata=["artist", "title"], + public=true, - jimbops_fallback - ) - ''; - }; + jimbops_fallback + ) + ''; } diff --git a/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix b/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix index b8540f0..af6907a 100644 --- a/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix +++ b/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix @@ -1,32 +1,30 @@ { pkgs, config, ... }: { - services.liquidsoap.streams = { - jimbops = pkgs.writeText "liquidjim" '' - settings.log.stdout.set(true) - settings.init.allow_root.set(true) - settings.scheduler.fast_queues.set(2) - - jimbops = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/JimboNFS/Music/JimBops")) - jimbops_fallback = fallback([jimbops, jimbops]) - - output.icecast( - %ffmpeg(format="ogg", %audio(codec="libvorbis", samplerate=48000, b="256k", channels=2)), - host="127.0.0.1", - port=265, - password="${config.secrets.castSourcePass}", - encoding = "UTF-8", + services.liquidsoap.streams.jimscrapped = pkgs.writeText "liquidstream2" '' + settings.log.stdout.set(true) + settings.init.allow_root.set(true) + settings.scheduler.fast_queues.set(2) + + jimscrapped = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/JimboNFS/Music/JimScrapped")) + jimscrapped_fallback = fallback([jimscrapped, jimscrapped]) + + output.icecast( + %ffmpeg(format="ogg", %audio(codec="libvorbis", samplerate=48000, b="256k", channels=2)), + host="127.0.0.1", + port=265, + password="${config.secrets.castSourcePass}", + encoding = "UTF-8", - radio="Jimbo's Scrap", - genre = "Scrapped", - description="Music canned from the main radio.", - website="https://icecast.${config.domains.jim1}", - url="https://icecast.${config.domains.jim1}/jimscrap.opus", - mount="jimscrap.opus", - icy_metadata=["artist", "title"], - public=true, + radio="Jimbo's Scrap", + genre = "Scrapped", + description="Music canned from the main radio.", + website="https://icecast.${config.domains.jim1}", + url="https://icecast.${config.domains.jim1}/jimscrapped.opus", + mount="jimscrapped.opus", + icy_metadata=["artist", "title"], + public=true, - jimbops_fallback - ) - ''; - }; + jimscrapped_fallback + ) + ''; } diff --git a/modules/system/services/server/icecast/nginx/default.nix b/modules/system/services/server/icecast/nginx/default.nix index ba97eab..de520cf 100644 --- a/modules/system/services/server/icecast/nginx/default.nix +++ b/modules/system/services/server/icecast/nginx/default.nix @@ -6,9 +6,6 @@ locations."/" = { proxyPass = "http://127.0.0.1:265"; proxyWebsockets = true; - extraConfig = '' - add_header Ice-Public "1"; - ''; }; }; }