diff --git a/meshmonitor/config.yaml b/meshmonitor/config.yaml index c49ea9d..0d7add7 100644 --- a/meshmonitor/config.yaml +++ b/meshmonitor/config.yaml @@ -1,6 +1,6 @@ name: "MeshMonitor" description: "Meshtastic Monitoring Dashboard" -version: "0.1.2" +version: "0.1.4" slug: "meshmonitor" arch: - aarch64 @@ -10,12 +10,12 @@ ingress_port: 3001 panel_icon: mdi:access-point-network panel_title: "MeshMonitor" ports: - 3001/tcp: 8080 + 3001/tcp: 3301 ports_description: 3001/tcp: "Web Interface (Optional direct access)" options: MESHTASTIC_NODE_IP: "192.168.1.100" - MESHTASTIC_TCP_PORT: 3001 + MESHTASTIC_TCP_PORT: 4403 SESSION_SECRET: "change_me_to_a_secure_random_string" DISABLE_ANONYMOUS: false schema: diff --git a/meshmonitor/run.sh b/meshmonitor/run.sh index d2be6c8..36525b9 100644 --- a/meshmonitor/run.sh +++ b/meshmonitor/run.sh @@ -15,9 +15,10 @@ export ALLOWED_ORIGINS="*" export COOKIE_SAMESITE="none" export COOKIE_SECURE=true -# Fetch the dynamic Home Assistant Ingress URL so assets load properly +# Fetch the dynamic Home Assistant Ingress URL and strip any trailing slash if [ -n "$SUPERVISOR_TOKEN" ]; then - export BASE_URL=$(curl -s -H "Authorization: Bearer ${SUPERVISOR_TOKEN}" http://supervisor/addons/self/info | jq --raw-output '.data.ingress_url') + RAW_URL=$(curl -s -H "Authorization: Bearer ${SUPERVISOR_TOKEN}" http://supervisor/addons/self/info | jq --raw-output '.data.ingress_url') + export BASE_URL="${RAW_URL%/}" echo "Ingress BASE_URL set to: $BASE_URL" fi