From 9d6929f7c086a4ccad23bdb810b12186d292ad72 Mon Sep 17 00:00:00 2001 From: Sergiusz Bazanski Date: Thu, 20 Jun 2019 12:52:38 +0200 Subject: [PATCH] app/radio: fix fallback mounts, fix admin login --- app/radio/kube/radio.libsonnet | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/radio/kube/radio.libsonnet b/app/radio/kube/radio.libsonnet index 83e0f43e..c13e82d1 100644 --- a/app/radio/kube/radio.libsonnet +++ b/app/radio/kube/radio.libsonnet @@ -87,7 +87,9 @@ local kube = import "../../../kube/kube.libsonnet"; ], ["authentication", ["source-password", cfg.icecast.authentication.sourcePassword], + ["relay-user", "relay"], ["relay-password", cfg.icecast.authentication.relayPassword], + ["admin-user", "admin"], ["admin-password", cfg.icecast.authentication.adminPassword], ], ["hostname", cfg.icecast.hostname], @@ -97,6 +99,7 @@ local kube = import "../../../kube/kube.libsonnet"; ["fileserve", "1"], ["paths", ["webroot", "/usr/share/icecast/web"], + ["adminroot", "/usr/share/icecast/admin"], ], ["logging", ["accesslog", "-"], @@ -115,9 +118,10 @@ local kube = import "../../../kube/kube.libsonnet"; ["genre", cfg.icecast.mounts[m].genre], ["bitrate", std.toString(cfg.icecast.mounts[m].bitrate)], ["hidden", if cfg.icecast.mounts[m].hidden then "1" else "0"], - ] + (if cfg.icecast.mounts[m].fallbackMount != null then - [["fallback-mount", cfg.icecast.mounts[m].fallbackMount]] else [] - ) + ] + (if cfg.icecast.mounts[m].fallbackMount != null then [ + ["fallback-mount", cfg.icecast.mounts[m].fallbackMount], + ["fallback-override", "1"], + ] else []) for m in std.objectFields(cfg.icecast.mounts) ]), },