diff --git a/ente/config.json b/ente/config.json index 84c168414..d2a261aa0 100644 --- a/ente/config.json +++ b/ente/config.json @@ -1,29 +1,9 @@ { - "name": "Ente", - "slug": "ente", - "version": "1.0.0test3", - "description": "Self-hosted, end-to-end-encrypted photo & video storage (Ente server + MinIO).", - "url": "https://github.com/alexbelgium/hassio-addons", - "arch": ["aarch64", "amd64"], - "image": "ghcr.io/alexbelgium/ente-{arch}", - "startup": "services", - "init": false, - "ports": { - "8080/tcp": 8280, - "3000/tcp": 8300, - "3200/tcp": 8320 - }, - "ports_description": { - "8080/tcp": "Ente API (museum)", - "3000/tcp": "Ente web UI", - "3200/tcp": "MinIO S3 endpoint" - }, - "map": [ - "addon_config:rw", - "media:rw", - "share:rw", - "ssl:rw" + "arch": [ + "aarch64", + "amd64" ], + "description": "Self-hosted, end-to-end-encrypted photo & video storage (Ente server + MinIO).", "devices": [ "/dev/dri", "/dev/dri/renderD128", @@ -33,45 +13,71 @@ "/dev/video12" ], "environment": { + "ENTE_API_ORIGIN": "http://[HOST]:[PORT:8080]", + "MINIO_ROOT_PASSWORD": "minioadmin", + "MINIO_ROOT_USER": "minioadmin", "PGID": "0", "PUID": "0", - "ENTE_API_ORIGIN": "http://[HOST]:[PORT:8080]", - "MINIO_ROOT_USER": "minioadmin", - "MINIO_ROOT_PASSWORD": "minioadmin", "S3_BUCKET": "ente-media", "S3_ENDPOINT": "http://localhost:3200", "TZ": "Europe/Paris" }, + "hassio_api": true, + "image": "ghcr.io/alexbelgium/ente-{arch}", + "init": false, + "map": [ + "addon_config:rw", + "media:rw", + "share:rw", + "ssl:rw" + ], + "name": "Ente", "options": { - "USE_EXTERNAL_DB": false, + "DB_DATABASE_NAME": "ente_db", "DB_HOSTNAME": "homeassistant.local", + "DB_PASSWORD": "ente", "DB_PORT": 5432, "DB_USERNAME": "pguser", - "DB_PASSWORD": "ente", - "DB_DATABASE_NAME": "ente_db", - "MINIO_ROOT_USER": "minioadmin", - "MINIO_ROOT_PASSWORD": "minioadmin", - "S3_BUCKET": "ente-media", "DISABLE_WEB_UI": false, - "TZ": "Europe/Paris" - }, - "schema": { - "USE_EXTERNAL_DB": "bool?", - "DB_HOSTNAME": "str?", - "DB_PORT": "int?", - "DB_USERNAME": "str?", - "DB_PASSWORD": "str?", - "DB_DATABASE_NAME": "str?", - "MINIO_ROOT_USER": "str", - "MINIO_ROOT_PASSWORD": "str", - "S3_BUCKET": "str", - "DISABLE_WEB_UI": "bool?", - "TZ": "str?" + "MINIO_ROOT_PASSWORD": "minioadmin", + "MINIO_ROOT_USER": "minioadmin", + "S3_BUCKET": "ente-media", + "TZ": "Europe/Paris", + "USE_EXTERNAL_DB": false }, "panel_icon": "mdi:image-multiple", - "webui": "http://[HOST]:[PORT:3000]", - "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH"], - "hassio_api": true, + "ports": { + "3000/tcp": 8300, + "3200/tcp": 8320, + "8080/tcp": 8280 + }, + "ports_description": { + "3000/tcp": "Ente web UI", + "3200/tcp": "MinIO S3 endpoint", + "8080/tcp": "Ente API (museum)" + }, + "privileged": [ + "SYS_ADMIN", + "DAC_READ_SEARCH" + ], + "schema": { + "DB_DATABASE_NAME": "str?", + "DB_HOSTNAME": "str?", + "DB_PASSWORD": "str?", + "DB_PORT": "int?", + "DB_USERNAME": "str?", + "DISABLE_WEB_UI": "bool?", + "MINIO_ROOT_PASSWORD": "str", + "MINIO_ROOT_USER": "str", + "S3_BUCKET": "str", + "TZ": "str?", + "USE_EXTERNAL_DB": "bool?" + }, + "slug": "ente", + "startup": "services", "udev": true, - "video": true + "url": "https://github.com/alexbelgium/hassio-addons", + "version": "1.0.0test3", + "video": true, + "webui": "http://[HOST]:[PORT:3000]" } diff --git a/ente/rootfs/etc/cont-init.d/10-generate-config.sh b/ente/rootfs/etc/cont-init.d/10-generate-config.sh index 562246b75..a25dd9fab 100755 --- a/ente/rootfs/etc/cont-init.d/10-generate-config.sh +++ b/ente/rootfs/etc/cont-init.d/10-generate-config.sh @@ -5,8 +5,8 @@ set -euo pipefail CFG=/config/museum.yaml if bashio::fs.file_exists "$CFG"; then - bashio::log.info "Using existing $CFG" - exit 0 + bashio::log.info "Using existing $CFG" + exit 0 fi bashio::log.info "Generating $CFG" @@ -21,12 +21,12 @@ DB_PASS="$(bashio::config 'DB_PASSWORD')" DB_NAME="$(bashio::config 'DB_DATABASE_NAME')" if ${USE_EXTERNAL_DB}; then - # override host/port for external DB (fall back if missing) - DB_HOST="$(bashio::config 'DB_HOSTNAME')" - DB_PORT="$(bashio::config 'DB_PORT')" - bashio::log.info "museum.yaml will point to external Postgres at ${DB_HOST}:${DB_PORT}" + # override host/port for external DB (fall back if missing) + DB_HOST="$(bashio::config 'DB_HOSTNAME')" + DB_PORT="$(bashio::config 'DB_PORT')" + bashio::log.info "museum.yaml will point to external Postgres at ${DB_HOST}:${DB_PORT}" else - bashio::log.info "museum.yaml will use internal Postgres." + bashio::log.info "museum.yaml will use internal Postgres." fi MINIO_USER="$(bashio::config 'MINIO_ROOT_USER')" diff --git a/ente/rootfs/etc/cont-init.d/20-internal-db-bootstrap.sh b/ente/rootfs/etc/cont-init.d/20-internal-db-bootstrap.sh index 79b98f103..031282e72 100755 --- a/ente/rootfs/etc/cont-init.d/20-internal-db-bootstrap.sh +++ b/ente/rootfs/etc/cont-init.d/20-internal-db-bootstrap.sh @@ -2,8 +2,8 @@ set -euo pipefail if bashio::config.true 'USE_EXTERNAL_DB'; then - bashio::log.info "External DB in use; skipping internal Postgres bootstrap." - exit 0 + bashio::log.info "External DB in use; skipping internal Postgres bootstrap." + exit 0 fi bashio::log.info "Bootstrapping internal Postgres cluster…" @@ -14,8 +14,8 @@ DB_NAME="$(bashio::config 'DB_DATABASE_NAME')" # Wait for postgres service (localhost) until pg_isready -q -h localhost -p 5432 -U postgres; do - bashio::log.info "Waiting for Postgres to accept connections…" - sleep 1 + bashio::log.info "Waiting for Postgres to accept connections…" + sleep 1 done bashio::log.info "Creating role + database if needed…" diff --git a/ente/rootfs/etc/services.d/00-postgres/run b/ente/rootfs/etc/services.d/00-postgres/run old mode 100644 new mode 100755 diff --git a/ente/rootfs/etc/services.d/01-minio/run b/ente/rootfs/etc/services.d/01-minio/run old mode 100644 new mode 100755 diff --git a/ente/rootfs/etc/services.d/02-minio-init/run b/ente/rootfs/etc/services.d/02-minio-init/run old mode 100644 new mode 100755 diff --git a/ente/rootfs/etc/services.d/03-museum/run b/ente/rootfs/etc/services.d/03-museum/run old mode 100644 new mode 100755 diff --git a/ente/rootfs/etc/services.d/04-web/run b/ente/rootfs/etc/services.d/04-web/run old mode 100644 new mode 100755