From c007b565ae302565ba47807964bdfc1d69722f9e Mon Sep 17 00:00:00 2001
From: Caine <caine@jihakuz.xyz>
Date: Sat, 7 Mar 2026 12:56:44 +0000
Subject: Move Icecast password to secrets.liq, remove from tracked files

---
 .gitignore         |  5 ++--
 ezstream.xml       | 71 ------------------------------------------------------
 radio.liq          |  4 ++-
 track_announce.liq |  2 +-
 4 files changed, 7 insertions(+), 75 deletions(-)
 delete mode 100755 ezstream.xml

diff --git a/.gitignore b/.gitignore
index fba6d85..a5a1707 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,5 +32,6 @@ __pycache__/
 # Legacy/backup files
 *.bak
 
-# Secrets — Icecast password is in radio.liq and track_announce.liq
-# These are tracked but the password should be moved to env var eventually
+# Secrets
+secrets.liq
+ezstream.xml
diff --git a/ezstream.xml b/ezstream.xml
deleted file mode 100755
index a6bd402..0000000
--- a/ezstream.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ezstream>
-  <servers>
-    <server>
-      <name>default</name>
-      <protocol>HTTP</protocol>
-      <hostname>127.0.0.1</hostname>
-      <port>8910</port>
-      <user>source</user>
-      <password>REDACTED</password>
-      <tls>None</tls>
-      <reconnect_attempts>20</reconnect_attempts>
-    </server>
-  </servers>
-
-  <streams>
-    <stream>
-      <mountpoint>/stream</mountpoint>
-      <intake>default</intake>
-      <server>default</server>
-      <public>No</public>
-      <format>MP3</format>
-      <encoder>mp3</encoder>
-      <stream_name>Radio Susan</stream_name>
-      <stream_url>https://radio.jihakuz.xyz</stream_url>
-      <stream_genre>Eclectic</stream_genre>
-      <stream_description>Personal radio station</stream_description>
-      <stream_bitrate>192</stream_bitrate>
-      <stream_samplerate>44100</stream_samplerate>
-      <stream_channels>2</stream_channels>
-    </stream>
-  </streams>
-
-  <intakes>
-    <intake>
-      <name>default</name>
-      <type>playlist</type>
-      <filename>/var/lib/radio/playlists/all.m3u</filename>
-      <shuffle>Yes</shuffle>
-      <stream_once>No</stream_once>
-    </intake>
-  </intakes>
-
-  <metadata>
-    <format_str>@a@ - @t@</format_str>
-    <normalize_strings>Yes</normalize_strings>
-    <no_updates>No</no_updates>
-  </metadata>
-
-  <decoders>
-    <decoder>
-      <name>ffmpeg-all</name>
-      <program>/var/lib/radio/decode.sh @T@</program>
-      <file_ext>.flac</file_ext>
-      <file_ext>.mp3</file_ext>
-      <file_ext>.ogg</file_ext>
-      <file_ext>.m4a</file_ext>
-      <file_ext>.opus</file_ext>
-      <file_ext>.wav</file_ext>
-      <file_ext>.wma</file_ext>
-    </decoder>
-  </decoders>
-
-  <encoders>
-    <encoder>
-      <name>mp3</name>
-      <format>MP3</format>
-      <program>/var/lib/radio/encode.sh</program>
-    </encoder>
-  </encoders>
-</ezstream>
diff --git a/radio.liq b/radio.liq
index 0f5b826..470cc92 100755
--- a/radio.liq
+++ b/radio.liq
@@ -4,6 +4,8 @@
 # Tracks, announcements, and jingles are all baked into playlist.m3u
 # Liquidsoap just plays it sequentially.
 
+%include "secrets.liq"
+
 set("log.file.path", "/var/lib/radio/radio.log")
 set("log.level", 3)
 set("server.telnet", true)
@@ -61,7 +63,7 @@ output.icecast(
   %mp3(bitrate=192),
   host="localhost",
   port=8910,
-  password="REDACTED",
+  password=icecast_password,
   mount="/stream",
   name="Radio Susan",
   description="Personal radio station",
diff --git a/track_announce.liq b/track_announce.liq
index 8aac476..d93b2f5 100755
--- a/track_announce.liq
+++ b/track_announce.liq
@@ -67,7 +67,7 @@ output.icecast(
   %mp3(bitrate=192),
   host="localhost",
   port=8910,
-  password="REDACTED",
+  password=icecast_password,
   mount="/stream",
   name="Radio Susan",
   description="Personal radio station",
-- 
cgit v1.2.3