3.3.0pre

Author: tiredofit

rootfs/container/functions/10-postgres

@@ -5,18 +5,18 @@
 postgres_bootstrap_filesystem() {
     create_folder \
                     "${CERT_PATH},\
-                    ${CONFIG_PATH},\
                     ${LOG_PATH}" \
                     postgres:postgres 755
 
     if [ -n "${CONFIG_PATH}" ] ; then
         create_folder \
                         "${CONFIG_PATH}" \
-                        postgres:postgres 755
+                        postgres:postgres 750
     fi
 
     create_folder \
-                    "${DATA_PATH},\
+                    "/etc/postgres,\
+                    ${DATA_PATH},\
                     ${WAL_PATH},\
                     /var/run/postgresql" \
                     postgres:postgres 700
@@ -84,7 +84,7 @@ EOF
 EOSQL
         fi
 
-        if ! grep -q "${MONITOR_USER}" "${HBA_FILE}" ; then
+        if ! ( [ -f "${HBA_FILE}" ] && grep -q "${MONITOR_USER}" "${HBA_FILE}" 2>/dev/null ); then
             print_notice "[configure_monitoring] Adding '${MONITOR_USER}' to '${HBA_FILE}'"
             echo "host       all        ${MONITOR_USER}     localhost               md5" | silent tee -a "${HBA_FILE}"
         fi
@@ -121,7 +121,7 @@ postgres_configure_replication() {
 EOSQL
                 fi
 
-                if ! grep -q "${REPLICATION_USER}" "${HBA_FILE}" ; then
+                if ! ( [ -f "${HBA_FILE}" ] && grep -q "${REPLICATION_USER}" "${HBA_FILE}" 2>/dev/null ); then
                     print_notice "[configure_replication] Adding '${REPLICATION_USER}/${REPLICATION_IP_ALLOW}' to '${HBA_FILE}'"
                     echo "host replication ${REPLICATION_USER} ${REPLICATION_IP_ALLOW} md5" | silent tee -a "${HBA_FILE}"
                 fi
@@ -222,14 +222,12 @@ postgres_configure_server() {
         local key="$2"
         local value="$3"
         local pattern="^${key}[[:space:]]*="
-        if grep -qE "${pattern}" "${file}"; then
-            s6-setuidgid postgres sed \
-                                        -i \
-                                        -E "s|${pattern}[[:space:]]*.*|${key} = ${value}|g"
-                                    "${file}"
-        else
-            echo "${key} = ${value}" | s6-setuidgid tee -a "${file}"
-        fi
+        # Only attempt grep/sed if the file exists; silence grep to prevent noisy errors
+        if [ -f "${file}" ] && grep -qE "${pattern}" "${file}" 2>/dev/null; then
+            s6-setuidgid postgres sed -i -E "s|${pattern}[[:space:]]*.*|${key} = ${value}|g" "${file}"
+         else
+             echo "${key} = ${value}" | silent s6-setuidgid postgres tee -a "${file}"
+         fi
     }
 
     if [ "${SETUP_MODE,,}" = "auto" ] ; then

rootfs/container/init/init.d/10-postgres

@@ -8,12 +8,12 @@ prepare_service 10-postgres
 SERVICE_NAME="postgres"
 output_off
 
-bootstrap_filesystem
-initialize_cluster
-configure_server
-control_server start
-create_databases
-configure_replication
-configure_monitoring
-control_server stop
+postgres_bootstrap_filesystem
+postgres_initialize_cluster
+postgres_configure_server
+postgres_control_server start
+postgres_create_databases
+postgres_configure_replication
+postgres_configure_monitoring
+postgres_control_server stop
 liftoff

rootfs/container/run/available/10-postgres/run

@@ -12,8 +12,14 @@ case "${LOG_TYPE,,}" in
     file ) hide_output=silent ;;
 esac
 
+if [ "${SETUP_MODE,,}" = "auto" ] ; then
+    engine_config="/etc/postgres/container.conf"
+else
+    engine_config="${CONFIG_PATH%/}/${CONFIG_FILE}"
+fi
+
 liftoff
 
 print_start "Starting PostgreSQL $(psql --version | head -n 1 | awk '{print $NF}')"
 TZ="${TIMEZONE}" ${hide_output} exec s6-setuidgid postgres postgres \
-                                    --config_file="${CONFIG_PATH%/}"/"${CONFIG_FILE}" ${SERVER_ARGS}
+                                                                    --config_file="${engine_config}" ${SERVER_ARGS}