avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-01-11 02:11:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update 99-run.sh

Browse Source
This commit is contained in:
Alexandre
2025-07-16 21:13:59 +02:00
committed by GitHub
parent 04bd557c1b
commit a778fcd323
1 changed files with 92 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
ente/rootfs/etc/cont-init.d/99-run.sh
View File

@@ -8,7 +8,7 @@ set -euo pipefail
mkdir -p /config/ente/custom-logs
mkdir -p /config/data
mkdir -p /config/minio-data
mkdir -p /config/postgres-data
mkdir -p /config/postgres
mkdir -p /config/scripts/compose
############################################
@@ -47,8 +47,7 @@ MC_BIN="/usr/local/bin/mc"
MUSEUM_BIN="/usr/bin/museum"
WEB_BIN="/usr/bin/ente-web"
# unify PGDATA
PGDATA="/config/postgres-data"
PGDATA="/config/postgres"
############################################
# Functions
@@ -76,6 +75,7 @@ start_postgres() {
fi
bashio::log.info "Starting Postgres (127.0.0.1:5432)..."
# background so startup can continue
su - postgres -c "$POSTGRES_BIN -D $PGDATA -c listen_addresses='127.0.0.1'" &
PG_PID=$!
}
@@ -90,7 +90,8 @@ wait_postgres_ready() {
else
host="$DB_HOST_INTERNAL"
port="$DB_PORT_INTERNAL"
user="postgres" # cluster superuser for initial readiness
# Use superuser 'postgres' for readiness check because DB_USER may not yet exist.
user="postgres"
bashio::log.info "Waiting for internal Postgres..."
fi
until pg_isready -q -h "$host" -p "$port" -U "$user"; do
@@ -103,25 +104,21 @@ bootstrap_internal_db() {
if $USE_EXTERNAL_DB; then
return 0
fi
bashio::log.info "Creating role/database if needed..."
# Escape single quotes in password for SQL
local esc_pass="${DB_PASS//\'/\'\'}"
bashio::log.info "Ensuring role ${DB_USER} exists..."
if ! su - postgres -c "psql -Atqc \"SELECT 1 FROM pg_roles WHERE rolname='${DB_USER}'\" postgres" | grep -q 1; then
su - postgres -c "psql -v ON_ERROR_STOP=1 -c \"CREATE ROLE \\\"${DB_USER}\\\" LOGIN PASSWORD '${esc_pass}'\" postgres"
else
# update password in case it changed
su - postgres -c "psql -v ON_ERROR_STOP=1 -c \"ALTER ROLE \\\"${DB_USER}\\\" PASSWORD '${esc_pass}'\" postgres"
fi
bashio::log.info "Ensuring database ${DB_NAME} exists (owner ${DB_USER})..."
if ! su - postgres -c "psql -Atqc \"SELECT 1 FROM pg_database WHERE datname='${DB_NAME}'\" postgres" | grep -q 1; then
su - postgres -c "createdb -O \"${DB_USER}\" \"${DB_NAME}\""
else
# make sure owner is correct
su - postgres -c "psql -v ON_ERROR_STOP=1 -c \"ALTER DATABASE \\\"${DB_NAME}\\\" OWNER TO \\\"${DB_USER}\\\"\" postgres"
fi
# Use psql via local socket (faster, avoids password)
psql -v ON_ERROR_STOP=1 -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U postgres <<SQL
DO \$\$
BEGIN
IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = '${DB_USER}') THEN
EXECUTE 'CREATE ROLE ${DB_USER} LOGIN PASSWORD ''' || replace('${DB_PASS}','''','''''') || '''';
END IF;
IF NOT EXISTS (SELECT 1 FROM pg_database WHERE datname = '${DB_NAME}') THEN
EXECUTE 'CREATE DATABASE ${DB_NAME} OWNER ${DB_USER}';
END IF;
END
\$\$;
SQL
bashio::log.info "Internal Postgres ready."
}
@@ -160,9 +157,9 @@ start_museum_foreground() {
return 1
fi
# If internal DB, verify DB_USER can connect (role creation just happened)
# For internal DB: wait one more time as DB_USER (ensures role exists)
if ! $USE_EXTERNAL_DB; then
bashio::log.info "Verifying internal DB user '${DB_USER}' connectivity..."
bashio::log.info "Verifying internal DB user '${DB_USER}'..."
until pg_isready -q -h "$DB_HOST_INTERNAL" -p "$DB_PORT_INTERNAL" -U "$DB_USER"; do
sleep 1
done
@@ -186,5 +183,5 @@ wait_minio_ready_and_bucket
start_web
# foreground: keeps container alive
# Last: foreground museum keeps container alive
start_museum_foreground