From bf138bcd9395a97609e5fcd9f14be31c5d754492 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Wed, 1 Jan 2025 16:54:27 -0500 Subject: [PATCH] Fix the liquidsoap stuff --- .../services/server/ddclient/default.nix | 2 +- .../server/fileserver/samba/default.nix | 1 - .../icecast/liquidsoap/jimbops/default.nix | 58 ++++++++++--------- .../liquidsoap/jimscrapped/default.nix | 58 ++++++++++--------- 4 files changed, 65 insertions(+), 54 deletions(-) diff --git a/modules/system/services/server/ddclient/default.nix b/modules/system/services/server/ddclient/default.nix index c4e5a21..0ab584e 100644 --- a/modules/system/services/server/ddclient/default.nix +++ b/modules/system/services/server/ddclient/default.nix @@ -3,7 +3,7 @@ services.ddclient = { enable = config.system.server.enable; protocol = "cloudflare"; - use = "web, web=https://ipinfo.io/ip"; + usev4 = "web, web=https://ipinfo.io/ip"; zone = "${config.domains.p1}"; username = "token"; passwordFile = "${pkgs.writeText "cloudflareapikey" config.secrets.flareApiKey}"; diff --git a/modules/system/services/server/fileserver/samba/default.nix b/modules/system/services/server/fileserver/samba/default.nix index f370180..7e2ef8d 100644 --- a/modules/system/services/server/fileserver/samba/default.nix +++ b/modules/system/services/server/fileserver/samba/default.nix @@ -3,7 +3,6 @@ services = lib.mkIf config.system.server.enable { samba = { enable = true; - securityType = "user"; openFirewall = true; settings = { global = { diff --git a/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix b/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix index 89d4dd9..074aecf 100644 --- a/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix +++ b/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix @@ -1,32 +1,38 @@ { pkgs, lib, config, ... }: { - services.liquidsoap.streams = lib.mkIf config.services.icecast.enable { - 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", + config = lib.mkIf config.services.icecast.enable { + services.liquidsoap.streams = { + jimbops = pkgs.writeText "jimbops" '' + 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.p1}", - url="https://icecast.${config.domains.p1}/jimbops.opus", - mount="jimbops.opus", - icy_metadata=["artist", "title"], - public=true, + name="JimBops Radio", + genre="Anything", + description="Music gathered by me, Jimbo.", + mount="jimbops.opus", + icy_metadata=["artist", "title"], + public=true, - jimbops_fallback - ) - ''; + jimbops_fallback + ) + ''; + }; + + # Avoid the most stupid error imaginable + systemd.services.jimbops = { + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + }; }; } diff --git a/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix b/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix index 28a26c8..0faba2c 100644 --- a/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix +++ b/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix @@ -1,32 +1,38 @@ { pkgs, lib, config, ... }: { - services.liquidsoap.streams = lib.mkIf config.services.icecast.enable { - 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", + config = lib.mkIf config.services.icecast.enable { + services.liquidsoap.streams = lib.mkIf config.services.icecast.enable { + jimscrapped = pkgs.writeText "jimscrapped" '' + 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.p1}", - url="https://icecast.${config.domains.p1}/jimscrapped.opus", - mount="jimscrapped.opus", - icy_metadata=["artist", "title"], - public=true, + name="Jimbo's Scrap", + genre="Scrapped", + description="Music canned from the main radio.", + mount="jimscrapped.opus", + icy_metadata=["artist", "title"], + public=true, - jimscrapped_fallback - ) - ''; + jimscrapped_fallback + ) + ''; + }; + + # Avoid the most stupid error imaginable + systemd.services.jimscrapped = { + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + }; }; }