From 8e5ba8de7f339a52a87c12914bbada265e97500a Mon Sep 17 00:00:00 2001 From: yukkop Date: Wed, 3 Jun 2026 12:37:44 +0000 Subject: [PATCH] fix --- package/db-tool/postgres-init.sh | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/package/db-tool/postgres-init.sh b/package/db-tool/postgres-init.sh index 98f293df..68255f96 100644 --- a/package/db-tool/postgres-init.sh +++ b/package/db-tool/postgres-init.sh @@ -39,9 +39,35 @@ postgres_init_main() { sed -i "1ilocal all all trust" "$data/pg_hba.conf" || return 1 fi + [ -f "$data/postgresql.auto.conf" ] || : > "$data/postgresql.auto.conf" + [ -f "$data/pg_ident.conf" ] || : > "$data/pg_ident.conf" + sed -i '/^[[:space:]]*port[[:space:]]*=/d' "$data/postgresql.conf" || return 1 sed -i '/^[[:space:]]*unix_socket_directories[[:space:]]*=/d' "$data/postgresql.conf" || return 1 + sed -i '/^[[:space:]]*port[[:space:]]*=/d' "$data/postgresql.auto.conf" || return 1 + sed -i '/^[[:space:]]*unix_socket_directories[[:space:]]*=/d' "$data/postgresql.auto.conf" || return 1 + sed -i '/^[[:space:]]*hba_file[[:space:]]*=/d' "$data/postgresql.auto.conf" || return 1 + sed -i '/^[[:space:]]*ident_file[[:space:]]*=/d' "$data/postgresql.auto.conf" || return 1 + sed -i '/^[[:space:]]*shared_preload_libraries[[:space:]]*=/d' "$data/postgresql.auto.conf" || return 1 + sed -i '/^[[:space:]]*cron\.database_name[[:space:]]*=/d' "$data/postgresql.auto.conf" || return 1 + sed -i '/^[[:space:]]*cron\.host[[:space:]]*=/d' "$data/postgresql.auto.conf" || return 1 { printf '%s\n' "port = $PG_PORT"; printf '%s\n' "unix_socket_directories = '$sockdir'"; } >> "$data/postgresql.conf" || return 1 + { + printf '%s\n' "port = '$PG_PORT'" + printf '%s\n' "unix_socket_directories = '$sockdir'" + printf '%s\n' "hba_file = '$data/pg_hba.conf'" + printf '%s\n' "ident_file = '$data/pg_ident.conf'" + if [ "$PG_DISABLE_LOGGING" -eq 0 ]; then + printf '%s\n' "logging_collector = 'on'" + else + printf '%s\n' "logging_collector = 'off'" + fi + if [ -n "$PG_SHARED_PRELOAD_LIBRARIES" ]; then + printf '%s\n' "shared_preload_libraries = '$PG_SHARED_PRELOAD_LIBRARIES'" + printf '%s\n' "cron.database_name = '$db'" + printf '%s\n' "cron.host = '$sockdir'" + fi + } >> "$data/postgresql.auto.conf" || return 1 if [ "${NO_TTY:-0}" = "1" ]; then _pg_log="$(mktemp /tmp/postgres-init-start.XXXXXX.log)" with_closed_fds pg_ctl -D "$data" -o "-F" -w start >"$_pg_log" 2>&1 || return 2