From e837330abfda995f5d2867b580902ea1f06ab27e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Krenzer?= Date: Mon, 4 Nov 2024 08:13:10 +0100 Subject: [PATCH 1/9] Add ingress antries to config.yaml --- snapserver/config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/snapserver/config.yaml b/snapserver/config.yaml index 229ba01..fc574c5 100644 --- a/snapserver/config.yaml +++ b/snapserver/config.yaml @@ -43,3 +43,8 @@ ports: 1705/tcp: 1705 1780/tcp: 1780 4953/tcp: 4953 +ingress: true +ingress_port: 1780 +panel_icon: mdi:cast-audio +panel_title: Snapcast +panel_admin: false From 21eeaea0aff06289392305011e27155c9979185f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Krenzer?= Date: Mon, 4 Nov 2024 08:39:52 +0100 Subject: [PATCH 2/9] Update config.yaml with webui parameter --- snapserver/config.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/snapserver/config.yaml b/snapserver/config.yaml index fc574c5..d88a5d3 100644 --- a/snapserver/config.yaml +++ b/snapserver/config.yaml @@ -45,6 +45,7 @@ ports: 4953/tcp: 4953 ingress: true ingress_port: 1780 -panel_icon: mdi:cast-audio +panel_icon: "mdi:cast-audio" panel_title: Snapcast panel_admin: false +webui: "http://[HOST]:[PORT:1780]/" From d324c7821998fdf1dc0dd30f1e762c1dd5b2c6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Krenzer?= Date: Mon, 4 Nov 2024 09:04:17 +0100 Subject: [PATCH 3/9] Update run.sh trying to get the webui running in ingress --- snapserver/run.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/snapserver/run.sh b/snapserver/run.sh index d488ace..7a27088 100644 --- a/snapserver/run.sh +++ b/snapserver/run.sh @@ -55,8 +55,7 @@ echo "sampleformat = ${sampleformat}" >> "${config}" # Http http=$(bashio::config 'http_enabled') echo "[http]" >> "${config}" -echo "enabled = ${http}" >> "${config}" -echo "bind_to_address = ::" >> "${config}" + # Datadir datadir=$(bashio::config 'server_datadir') echo "doc_root = ${datadir}" >> "${config}" From eee08642dcffb4aca42c5b3aa07829a2bfbb6537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Krenzer?= Date: Mon, 4 Nov 2024 09:41:42 +0100 Subject: [PATCH 4/9] Update config.yaml --- snapserver/config.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/snapserver/config.yaml b/snapserver/config.yaml index d88a5d3..65adb92 100644 --- a/snapserver/config.yaml +++ b/snapserver/config.yaml @@ -41,11 +41,10 @@ schema: ports: 1704/tcp: 1704 1705/tcp: 1705 - 1780/tcp: 1780 4953/tcp: 4953 ingress: true ingress_port: 1780 panel_icon: "mdi:cast-audio" -panel_title: Snapcast +panel_title: "Snapcast" panel_admin: false webui: "http://[HOST]:[PORT:1780]/" From 03c5ef7c3fbb1178b63a3494c0d6d265caab6b79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Krenzer?= Date: Mon, 4 Nov 2024 09:56:54 +0100 Subject: [PATCH 5/9] Update config.yaml --- snapserver/config.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/snapserver/config.yaml b/snapserver/config.yaml index 65adb92..9911d92 100644 --- a/snapserver/config.yaml +++ b/snapserver/config.yaml @@ -41,7 +41,13 @@ schema: ports: 1704/tcp: 1704 1705/tcp: 1705 + 1780/tcp: 1780 4953/tcp: 4953 +ports_description: + 1704/tcp: "Snapcast Stream" + 1705/tcp: "Snapcast JSON RPC" + 1780/tcp: "Snapcast HTTP controller" + 4953/tcp: "Snapcast HA TCP input" ingress: true ingress_port: 1780 panel_icon: "mdi:cast-audio" From d44db9cefa4e38f9e6408838d46ffd47fb483d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Krenzer?= Date: Mon, 4 Nov 2024 10:02:17 +0100 Subject: [PATCH 6/9] Update run.sh --- snapserver/run.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/snapserver/run.sh b/snapserver/run.sh index 7a27088..cb3de6a 100644 --- a/snapserver/run.sh +++ b/snapserver/run.sh @@ -55,6 +55,8 @@ echo "sampleformat = ${sampleformat}" >> "${config}" # Http http=$(bashio::config 'http_enabled') echo "[http]" >> "${config}" +echo "enabled = ${http}" >> "${config}" +echo "bind_to_address = ::" >> "${config}" # Datadir datadir=$(bashio::config 'server_datadir') From 1ec0fd3eb509b53fa9a18e77cd30f1faa82d04a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Krenzer?= Date: Mon, 4 Nov 2024 10:49:17 +0100 Subject: [PATCH 7/9] Add IPv4 bind address to http --- snapserver/run.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/snapserver/run.sh b/snapserver/run.sh index cb3de6a..ee99174 100644 --- a/snapserver/run.sh +++ b/snapserver/run.sh @@ -56,6 +56,7 @@ echo "sampleformat = ${sampleformat}" >> "${config}" http=$(bashio::config 'http_enabled') echo "[http]" >> "${config}" echo "enabled = ${http}" >> "${config}" +echo "bind_to_address = 0.0.0.0" >> "${config}" echo "bind_to_address = ::" >> "${config}" # Datadir From ae3a81f1c0efdbfe4918f39391d94da4c1279332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Krenzer?= Date: Mon, 4 Nov 2024 12:53:47 +0100 Subject: [PATCH 8/9] Modify config.js of snapweb for ingress --- snapserver/run.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/snapserver/run.sh b/snapserver/run.sh index ee99174..c85dca7 100644 --- a/snapserver/run.sh +++ b/snapserver/run.sh @@ -78,5 +78,13 @@ echo "[server]" >> "${config}" threads=$(bashio::config 'server_threads') echo "threads = ${threads}" >> "${config}" +# Modify snapweb websocket for ingress +cat > ${datadir}/config.js < Date: Mon, 4 Nov 2024 12:58:09 +0100 Subject: [PATCH 9/9] Add some logging --- snapserver/run.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/snapserver/run.sh b/snapserver/run.sh index c85dca7..24b0851 100644 --- a/snapserver/run.sh +++ b/snapserver/run.sh @@ -79,6 +79,7 @@ threads=$(bashio::config 'server_threads') echo "threads = ${threads}" >> "${config}" # Modify snapweb websocket for ingress +bashio::log.info "Adding ingress config to snapweb in ${datadir}/config.js..." cat > ${datadir}/config.js <