From 4a2c1c682b37dcd291b898537e07f68f0e87b5ca Mon Sep 17 00:00:00 2001
From: Roy Olav Purser <admin@royolav.net>
Date: Wed, 10 Mar 2021 00:31:55 +0100
Subject: [PATCH] change port

---
 Dockerfile   |  1 -
 icecast.xml  | 17 -----------------
 playlist.m3u | 32 ++++++++++++++++----------------
 3 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d65d55a..9c6d59d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,6 @@
 FROM alpine:edge as base
 RUN ["apk", "add", "--no-cache", "icecast"]
 COPY ["icecast.xml", "/app/icecast.xml"]
-COPY ["playlist.m3u", "/app/web/playlist.m3u"]
 
 FROM scratch
 COPY --from=base / /
diff --git a/icecast.xml b/icecast.xml
index d2be766..ebe6c54 100644
--- a/icecast.xml
+++ b/icecast.xml
@@ -7,7 +7,6 @@
     <admin>admin@royolav.net</admin>
     <fileserve>1</fileserve>
     <paths>
-        <webroot>/app/web</webroot>
         <logdir>/data</logdir>
     </paths>
     <relay>
@@ -140,97 +139,81 @@
     </relay>
     <mount type="normal">
         <charset>UTF-8</charset>
-        <bitrate>192</bitrate>
         <mount-name>/ch-200</mount-name>
         <stream-name>NRK P1 Innlandet</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
-        <bitrate>192</bitrate>
         <mount-name>/ch-201</mount-name>
         <stream-name>NRK P2</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
-        <bitrate>192</bitrate>
         <mount-name>/ch-202</mount-name>
         <stream-name>NRK P3</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
-        <bitrate>192</bitrate>
         <mount-name>/ch-203</mount-name>
         <stream-name>NRK mP3</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
-        <bitrate>192</bitrate>
         <mount-name>/ch-204</mount-name>
         <stream-name>NRK P13</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
-        <bitrate>192</bitrate>
         <mount-name>/ch-205</mount-name>
         <stream-name>P4 Lyden av Norge</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
-        <bitrate>192</bitrate>
         <mount-name>/ch-206</mount-name>
         <stream-name>P5 Hits</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
-        <bitrate>192</bitrate>
         <mount-name>/ch-207</mount-name>
         <stream-name>P6 Rock</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
-        <bitrate>192</bitrate>
         <mount-name>/ch-208</mount-name>
         <stream-name>P7 Klem</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
-        <bitrate>192</bitrate>
         <mount-name>/ch-209</mount-name>
         <stream-name>P8 Pop</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
-        <bitrate>192</bitrate>
         <mount-name>/ch-210</mount-name>
         <stream-name>P9 Retro</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
-        <bitrate>192</bitrate>
         <mount-name>/ch-211</mount-name>
         <stream-name>Radio Metro</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
-        <bitrate>192</bitrate>
         <mount-name>/ch-212</mount-name>
         <stream-name>Radio Norge</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
-        <bitrate>192</bitrate>
         <mount-name>/ch-213</mount-name>
         <stream-name>Radio Nova</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
-        <bitrate>192</bitrate>
         <mount-name>/ch-214</mount-name>
         <stream-name>Radio Randsfjord</stream-name>
     </mount>
     <mount type="normal">
         <charset>UTF-8</charset>
-        <bitrate>192</bitrate>
         <mount-name>/ch-215</mount-name>
         <stream-name>Radio Rock</stream-name>
     </mount>
diff --git a/playlist.m3u b/playlist.m3u
index 63cf047..3f463bd 100644
--- a/playlist.m3u
+++ b/playlist.m3u
@@ -1,36 +1,36 @@
 #EXTM3U
 #EXTINF:0 radio="true", NRK P1 Innlandet
-https://icecast.purser.it/ch-200
+https://icecast.purser.it:7000/ch-200
 #EXTINF:0 radio="true", NRK P2
-https://icecast.purser.it/ch-201
+https://icecast.purser.it:7000/ch-201
 #EXTINF:0 radio="true", NRK P3
-https://icecast.purser.it/ch-202
+https://icecast.purser.it:7000/ch-202
 #EXTINF:0 radio="true", NRK mP3
-https://icecast.purser.it/ch-203
+https://icecast.purser.it:7000/ch-203
 #EXTINF:0 radio="true", NRK P13
-https://icecast.purser.it/ch-204
+https://icecast.purser.it:7000/ch-204
 #EXTINF:0 radio="true", P4 Lyden av Norge
-https://icecast.purser.it/ch-205
+https://icecast.purser.it:7000/ch-205
 #EXTINF:0 radio="true", P5 Hits
-https://icecast.purser.it/ch-206
+https://icecast.purser.it:7000/ch-206
 #EXTINF:0 radio="true", P6 Rock
-https://icecast.purser.it/ch-207
+https://icecast.purser.it:7000/ch-207
 #EXTINF:0 radio="true", P7 Klem
-https://icecast.purser.it/ch-208
+https://icecast.purser.it:7000/ch-208
 #EXTINF:0 radio="true", P8 Pop
-https://icecast.purser.it/ch-209
+https://icecast.purser.it:7000/ch-209
 #EXTINF:0 radio="true", P9 Retro
-https://icecast.purser.it/ch-210
+https://icecast.purser.it:7000/ch-210
 #EXTINF:0 radio="true", Radio Metro
-https://icecast.purser.it/ch-211
+https://icecast.purser.it:7000/ch-211
 #EXTINF:0 radio="true", Radio Norge
-https://icecast.purser.it/ch-212
+https://icecast.purser.it:7000/ch-212
 #EXTINF:0 radio="true", Radio Nova
-https://icecast.purser.it/ch-213
+https://icecast.purser.it:7000/ch-213
 #EXTINF:0 radio="true", Radio Randsfjord
-https://icecast.purser.it/ch-214
+https://icecast.purser.it:7000/ch-214
 #EXTINF:0 radio="true", Radio Rock
-https://icecast.purser.it/ch-215
+https://icecast.purser.it:7000/ch-215
 #EXTINF:0 radio="false", NRK 1
 https://nrk-live-no.telenorcdn.net/21/1/hls/nrk_1/playlist.m3u8
 #EXTINF:0 radio="false", NRK 2