diff --git a/icedreammusic/docker-compose.yml b/icedreammusic/docker-compose.yml index cbd3427..0100224 100644 --- a/icedreammusic/docker-compose.yml +++ b/icedreammusic/docker-compose.yml @@ -21,6 +21,11 @@ services: restart: always devices: - /dev/dri:/dev/dri + environment: + - INTERNAL_ICECAST_USERNAME=${INTERNAL_ICECAST_USERNAME:-source} + - INTERNAL_ICECAST_PASSWORD=${INTERNAL_ICECAST_PASSWORD:-source} + - REKTNETWORK_USERNAME + - REKTNETWORK_PASSWORD deploy: resources: limits: diff --git a/icedreammusic/liquidsoap/settings.liq b/icedreammusic/liquidsoap/settings.liq index e85b3d7..5a662a0 100644 --- a/icedreammusic/liquidsoap/settings.liq +++ b/icedreammusic/liquidsoap/settings.liq @@ -1,11 +1,5 @@ -#stream_name="The Escape Plan 003" -#stream_name="Icedream's Secret Mix 08" -#stream_name="TGIF mix" -#stream_name="Icedream pres. Imaginary Frequencies 057" -stream_name="Spontaneously live in the mix" -#stream_name="Sunday Straight Shredding, I guess" -#stream_name="Icedream's New Year's celebration stream" - -# codec = %ogg(%vorbis.abr(samplerate=44100, bitrate=500, min_bitrate=32, max_bitrate=512)) -# codec = %mp3(bitrate=320) -# codec = %ogg(%opus(bitrate=192, complexity=10, max_bandwidth="full_band", application="audio", signal="music")) +stream_name=getenv(default="Spontaneously live in the mix", "STREAM_NAME") +internal_icecast_username=getenv(default="source", "INTERNAL_ICECAST_USERNAME") +internal_icecast_password=getenv(default="source", "INTERNAL_ICECAST_PASSWORD") +rektfm_username=getenv("REKTNETWORK_USERNAME") +rektfm_password=getenv("REKTNETWORK_PASSWORD") diff --git a/icedreammusic/liquidsoap/stream.liq b/icedreammusic/liquidsoap/stream.liq index 0816a31..61cf999 100644 --- a/icedreammusic/liquidsoap/stream.liq +++ b/icedreammusic/liquidsoap/stream.liq @@ -36,7 +36,9 @@ internal_icecast=output.icecast( fallible=true, port=61120, host="127.0.0.1", - name=stream_name()) + user=internal_icecast_username, + password=internal_icecast_password, + name=stream_name) setup_harbor_stream_api(internal_icecast( id="out_a_int", %ffmpeg(format="ogg", %audio.copy), @@ -44,16 +46,19 @@ setup_harbor_stream_api(internal_icecast( a_flac)) # REKT.fm -setup_harbor_stream_api(output.icecast( - id="out_a_rekt", - %ffmpeg(format="ogg", %audio.copy), - fallible=true, - mount="rekt", - port=60000, - #host="stream.rekt.network", - host="stream.rekt.fm", - user="icedream", - name=stream_name(), - password="***REMOVED***", - start=false, - a_flac)) +if string.length(rektfm_username) > 0 and string.length(rektfm_password) > 0 then + setup_harbor_stream_api(output.icecast( + id="out_a_rekt", + #%ogg(%flac), + %ffmpeg(format="ogg", %audio.copy), + fallible=true, + mount="rekt", + port=60001, + #host="stream.rekt.network", + host="stream.rekt.fm", + user=rektfm_username, + name=stream_name, + password=rektfm_password, + start=false, + a_flac)) +end