3.3.0pre

Author: tiredofit

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
+    local engine_config="/etc/postgres/container.conf"
+else
+    local 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}" ${POSTGRES_ARGS}