From 4c41777823e6358ebd08a5b847ecc889f7af2cf9 Mon Sep 17 00:00:00 2001
From: Glenn Thompson <glennt40@gmail.com>
Date: Wed, 1 Oct 2025 21:37:18 +0300
Subject: [PATCH] fix: Clean up main icecast.xml configuration for production
 use

- Add <changeowner> section to fix 'run as root' error
- Remove complex mount configurations, let Docker handle automatically
- Fix log directory path from /var/log/icecast2/ to /var/log/icecast/
- Update docker-compose.yml to use main icecast.xml instead of minimal version
- Remove temporary minimal-icecast.xml workaround file

All three streams now working with clean main configuration:
- asteroid.aac (96kbps AAC - recommended)
- asteroid.mp3 (128kbps MP3 - compatible)
- asteroid-low.mp3 (64kbps MP3 - low bandwidth)

AAC streaming feature is now production-ready with proper Docker integration.
---
 docker/docker-compose.yml |  2 +-
 docker/icecast.xml        | 61 ++++-----------------------------------
 2 files changed, 6 insertions(+), 57 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index eb985f4..d6b7034 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     ports:
       - "8000:8000"
     volumes:
-      - ./icecast.xml:/etc/icecast2/icecast.xml:ro
+      - ./icecast.xml:/etc/icecast.xml
     environment:
       - ICECAST_SOURCE_PASSWORD=H1tn31EhsyLrfRmo
       - ICECAST_ADMIN_PASSWORD=asteroid_admin_2024
diff --git a/docker/icecast.xml b/docker/icecast.xml
index cf2a4d0..5746a35 100644
--- a/docker/icecast.xml
+++ b/docker/icecast.xml
@@ -26,67 +26,12 @@
         <port>8000</port>
     </listen-socket>
 
-    <mount type="normal">
-        <mount-name>/asteroid.mp3</mount-name>
-        <username>source</username>
-        <password>H1tn31EhsyLrfRmo</password>
-        <max-listeners>100</max-listeners>
-        <dump-file>/tmp/asteroid-dump.mp3</dump-file>
-        <burst-size>65536</burst-size>
-        <fallback-mount>/silence.mp3</fallback-mount>
-        <fallback-override>1</fallback-override>
-        <fallback-when-full>1</fallback-when-full>
-        <intro>/intro.mp3</intro>
-        <hidden>0</hidden>
-        <public>1</public>
-        <stream-name>Asteroid Radio</stream-name>
-        <stream-description>Music for Hackers - Streaming from the Asteroid</stream-description>
-        <stream-url>http://localhost:8080/asteroid/</stream-url>
-        <genre>Electronic/Alternative</genre>
-        <bitrate>128</bitrate>
-        <type>audio/mpeg</type>
-        <subtype>mp3</subtype>
-    </mount>
-
-    <mount type="normal">
-        <mount-name>/asteroid.aac</mount-name>
-        <username>source</username>
-        <password>H1tn31EhsyLrfRmo</password>
-        <max-listeners>100</max-listeners>
-        <burst-size>65536</burst-size>
-        <hidden>0</hidden>
-        <public>1</public>
-        <stream-name>Asteroid Radio (AAC)</stream-name>
-        <stream-description>Music for Hackers - High efficiency AAC stream</stream-description>
-        <stream-url>http://localhost:8080/asteroid/</stream-url>
-        <genre>Electronic/Alternative</genre>
-        <bitrate>96</bitrate>
-        <type>audio/aac</type>
-        <subtype>aac</subtype>
-    </mount>
-
-    <mount type="normal">
-        <mount-name>/asteroid-low.mp3</mount-name>
-        <username>source</username>
-        <password>H1tn31EhsyLrfRmo</password>
-        <max-listeners>100</max-listeners>
-        <burst-size>65536</burst-size>
-        <hidden>0</hidden>
-        <public>1</public>
-        <stream-name>Asteroid Radio (Low Quality)</stream-name>
-        <stream-description>Music for Hackers - Low bandwidth stream</stream-description>
-        <stream-url>http://localhost:8080/asteroid/</stream-url>
-        <genre>Electronic/Alternative</genre>
-        <bitrate>64</bitrate>
-        <type>audio/mpeg</type>
-        <subtype>mp3</subtype>
-    </mount>
 
     <fileserve>1</fileserve>
 
     <paths>
         <basedir>/usr/share/icecast2</basedir>
-        <logdir>/var/log/icecast2</logdir>
+        <logdir>/var/log/icecast</logdir>
         <webroot>/usr/share/icecast2/web</webroot>
         <adminroot>/usr/share/icecast2/admin</adminroot>
         <alias source="/" destination="/status.xsl"/>
@@ -101,5 +46,9 @@
 
     <security>
         <chroot>0</chroot>
+        <changeowner>
+            <user>icecast</user>
+            <group>icecast</group>
+        </changeowner>
     </security>
 </icecast>