From 89df640115926100a6f93b488bedc0ac72210696 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 4 Jun 2026 12:57:34 +0000 Subject: [PATCH] fix(ente): fix API origin for web UI, remove dead options, hardcode MinIO creds --- ente/CHANGELOG.md | 3 +++ ente/README.md | 8 +------- ente/config.yaml | 6 ------ ente/rootfs/etc/cont-init.d/99-run.sh | 11 ++++++----- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/ente/CHANGELOG.md b/ente/CHANGELOG.md index c1322e726d..dbd56d163f 100644 --- a/ente/CHANGELOG.md +++ b/ente/CHANGELOG.md @@ -1,6 +1,9 @@ ## 4.4.22-3 (04-06-2026) - Remove DISABLE_WEB_UI option, web UI is now always enabled - Make MinIO internal-only (127.0.0.1) since museum proxies S3 operations +- Fix web UI API origin: use ENTE_ENDPOINT_URL so browsers can reach the API +- Hardcode MinIO credentials internally (no longer user-configurable) +- Remove dead options: MINIO_DATA_LOCATION, MINIO_ROOT_USER, MINIO_ROOT_PASSWORD ## 4.4.22-2 (04-06-2026) - Minor bugs fixed diff --git a/ente/README.md b/ente/README.md index e1c18ce4c5..002eadca90 100644 --- a/ente/README.md +++ b/ente/README.md @@ -53,10 +53,7 @@ Webui can be found at . | Option | Type | Default | Description | |--------|------|---------|-------------| -| `ENTE_ENDPOINT_URL` | str | `http://homeassistant.local:8280` | The URL where Ente API will be accessible | -| `MINIO_ROOT_USER` | str | `minioadmin` | MinIO root username | -| `MINIO_ROOT_PASSWORD` | str | `minioadmin` | MinIO root password | -| `MINIO_DATA_LOCATION` | str | `/config/minio-data` | Path where MinIO stores data | +| `ENTE_ENDPOINT_URL` | str | `http://homeassistant.local:8280` | The URL where Ente API will be accessible (used by web UI) | | `DB_PASSWORD` | str | `ente` | Database password for internal PostgreSQL | | `USE_EXTERNAL_DB` | bool | `false` | Use external PostgreSQL database | | `TZ` | str | `Europe/Paris` | Timezone setting | @@ -76,9 +73,6 @@ If you want to use an external PostgreSQL database, set `USE_EXTERNAL_DB: true` ```yaml ENTE_ENDPOINT_URL: "http://homeassistant.local:8280" -MINIO_ROOT_USER: "myuser" -MINIO_ROOT_PASSWORD: "mypassword" -MINIO_DATA_LOCATION: "/config/ente-storage" DB_PASSWORD: "securepassword" TZ: "America/New_York" ``` diff --git a/ente/config.yaml b/ente/config.yaml index 462d5d6c05..42387e62cf 100644 --- a/ente/config.yaml +++ b/ente/config.yaml @@ -79,9 +79,6 @@ options: env_vars: [] DB_PASSWORD: ente ENTE_ENDPOINT_URL: http://homeassistant.local:8280 - MINIO_DATA_LOCATION: /config/minio-data - MINIO_ROOT_PASSWORD: minioadmin - MINIO_ROOT_USER: minioadmin TZ: Europe/Paris USE_EXTERNAL_DB: false ports: @@ -113,9 +110,6 @@ schema: DB_PORT: int? DB_USERNAME: str? ENTE_ENDPOINT_URL: str - MINIO_DATA_LOCATION: str - MINIO_ROOT_PASSWORD: str - MINIO_ROOT_USER: str TZ: str? USE_EXTERNAL_DB: bool? cifsdomain: str? diff --git a/ente/rootfs/etc/cont-init.d/99-run.sh b/ente/rootfs/etc/cont-init.d/99-run.sh index be1c8f4ce6..a2783e5d5e 100755 --- a/ente/rootfs/etc/cont-init.d/99-run.sh +++ b/ente/rootfs/etc/cont-init.d/99-run.sh @@ -2,8 +2,9 @@ # shellcheck shell=bash set -euo pipefail -MINIO_USER="$(bashio::config 'MINIO_ROOT_USER')" -MINIO_PASS="$(bashio::config 'MINIO_ROOT_PASSWORD')" +# Internal MinIO credentials (not user-configurable; MinIO is 127.0.0.1 only) +MINIO_USER="minioadmin" +MINIO_PASS="minioadmin" S3_BUCKET="b2-eu-cen" export ENTE_S3_ARE_LOCAL_BUCKETS=true @@ -201,8 +202,8 @@ wait_minio_ready_and_bucket() { # Web (static nginx bundle) ############################################ start_web() { - ENTE_API_ORIGIN=http://localhost:8080 - ENTE_ALBUMS_ORIGIN=http://localhost:3002 + ENTE_API_ORIGIN="$(bashio::config 'ENTE_ENDPOINT_URL')" + ENTE_ALBUMS_ORIGIN="http://localhost:3002" export ENTE_API_ORIGIN ENTE_ALBUMS_ORIGIN # Running ente-web-prepare @@ -216,7 +217,7 @@ start_web() { mv /etc/nginx/http.d/web.bak /etc/nginx/http.d/web.conf bashio::log.info "Starting Ente web (nginx, ports 3000‑3009)..." - exec nginx -g 'daemon off;' & + nginx -g 'daemon off;' & WEB_PID=$! }