iron the s2i hooks

- postgresql-config renamed to postgresql-cfg to have consistent
  naming across sclorg images
- the postgresql-cfg is now handled in "pre-init" phase, at the
  same time when the environment volumes are taken into account
- postgresql-start-hook renamed to postgresql-start to avoid
  non-standard -hook suffix
- better documentation to ensure reader when/under which condition
  the hooks are evaluated
- the CONTAINER_SCRIPTS_PATH path has ./postgresql/ path in
  itself, there's no need to prefix once more the hook directory
  like "postgrsql-init" -- "init" is enough

Author: praiskup

9.4/root/usr/bin/run-postgresql

@@ -24,12 +24,12 @@ fi
 
 pg_ctl -w start -o "-h ''"
 if $PG_INITIALIZED ; then
-    process_extending_files ${APP_DATA}/src/postgresql-init ${CONTAINER_SCRIPTS_PATH}/postgresql-init
+    process_extending_files ${APP_DATA}/src/postgresql-init ${CONTAINER_SCRIPTS_PATH}/init
     migrate_db
     create_users
 fi
 
-process_extending_files ${APP_DATA}/src/postgresql-start-hook ${CONTAINER_SCRIPTS_PATH}/postgresql-start-hook
+process_extending_files ${APP_DATA}/src/postgresql-start ${CONTAINER_SCRIPTS_PATH}/start
 
 pg_ctl stop
 

9.4/root/usr/share/container-scripts/postgresql/README.md

@@ -252,18 +252,26 @@ $ s2i build ~/image-configuration/ postgresql new-postgresql
 The directory passed to `s2i build` should contain one or more of the
 following directories:
 
-##### `postgresql-config/`
+##### `postgresql-cfg/`
 
-contained configuration files (`*.conf`) will be included at the end of image postgresql.conf file during database initialization
+Contained configuration files (`*.conf`) will be included at the end of image
+postgresql.conf file.
 
 
 ##### `postgresql-init/`
 
-contained shell scripts (`*.sh`) are sourced once, when database is initialized
+Contained shell scripts (`*.sh`) are sourced when the database is freshly
+initialized (after successful initdb run which made the data directory
+non-empty).  At the time of sourcing these scripts, the local PostgreSQL
+server is running.  For re-deployments scenarios with persistent data
+directory, the scripts are not sourced (no-op).
 
-##### `postgresql-start-hook/`
 
-contained shell scripts (`*.sh`) are sourced before every start
+##### `postgresql-start/`
+
+Same sematics as `postgresql-init/`, except that these scripts are
+always sourced (after `postgresql-init/` scripts, if they exist).
+
 
 ----------------------------------------------
 

9.4/root/usr/share/container-scripts/postgresql/common.sh

@@ -125,6 +125,13 @@ function generate_postgresql_config() {
         < "${CONTAINER_SCRIPTS_PATH}/openshift-custom-postgresql-replication.conf.template" \
         >> "${POSTGRESQL_CONFIG_FILE}"
   fi
+
+  (
+  shopt -s nullglob
+  for conf in "${APP_DATA}"/src/postgresql-cfg/*.conf; do
+    echo include \'${conf}\' >> "${POSTGRESQL_CONFIG_FILE}"
+  done
+  )
 }
 
 function generate_postgresql_recovery_config() {

9.4/root/usr/share/container-scripts/postgresql/postgresql-init/set-config.sh

@@ -24,12 +24,12 @@ fi
 
 pg_ctl -w start -o "-h ''"
 if $PG_INITIALIZED ; then
-    process_extending_files ${APP_DATA}/src/postgresql-init ${CONTAINER_SCRIPTS_PATH}/postgresql-init
+    process_extending_files ${APP_DATA}/src/postgresql-init ${CONTAINER_SCRIPTS_PATH}/init
     migrate_db
     create_users
 fi
 
-process_extending_files ${APP_DATA}/src/postgresql-start-hook ${CONTAINER_SCRIPTS_PATH}/postgresql-start-hook
+process_extending_files ${APP_DATA}/src/postgresql-start ${CONTAINER_SCRIPTS_PATH}/start
 
 pg_ctl stop
 

9.4/root/usr/share/container-scripts/postgresql/postgresql-start-hook/set_passwords.sh renamed to 9.4/root/usr/share/container-scripts/postgresql/start/set_passwords.sh

@@ -252,18 +252,26 @@ $ s2i build ~/image-configuration/ postgresql new-postgresql
 The directory passed to `s2i build` should contain one or more of the
 following directories:
 
-##### `postgresql-config/`
+##### `postgresql-cfg/`
 
-contained configuration files (`*.conf`) will be included at the end of image postgresql.conf file during database initialization
+Contained configuration files (`*.conf`) will be included at the end of image
+postgresql.conf file.
 
 
 ##### `postgresql-init/`
 
-contained shell scripts (`*.sh`) are sourced once, when database is initialized
+Contained shell scripts (`*.sh`) are sourced when the database is freshly
+initialized (after successful initdb run which made the data directory
+non-empty).  At the time of sourcing these scripts, the local PostgreSQL
+server is running.  For re-deployments scenarios with persistent data
+directory, the scripts are not sourced (no-op).
 
-##### `postgresql-start-hook/`
 
-contained shell scripts (`*.sh`) are sourced before every start
+##### `postgresql-start/`
+
+Same sematics as `postgresql-init/`, except that these scripts are
+always sourced (after `postgresql-init/` scripts, if they exist).
+
 
 ----------------------------------------------
 

9.5/root/usr/bin/run-postgresql

@@ -125,6 +125,13 @@ function generate_postgresql_config() {
         < "${CONTAINER_SCRIPTS_PATH}/openshift-custom-postgresql-replication.conf.template" \
         >> "${POSTGRESQL_CONFIG_FILE}"
   fi
+
+  (
+  shopt -s nullglob
+  for conf in "${APP_DATA}"/src/postgresql-cfg/*.conf; do
+    echo include \'${conf}\' >> "${POSTGRESQL_CONFIG_FILE}"
+  done
+  )
 }
 
 function generate_postgresql_recovery_config() {

9.5/root/usr/share/container-scripts/postgresql/README.md

@@ -24,12 +24,12 @@ fi
 
 pg_ctl -w start -o "-h ''"
 if $PG_INITIALIZED ; then
-    process_extending_files ${APP_DATA}/src/postgresql-init ${CONTAINER_SCRIPTS_PATH}/postgresql-init
+    process_extending_files ${APP_DATA}/src/postgresql-init ${CONTAINER_SCRIPTS_PATH}/init
     migrate_db
     create_users
 fi
 
-process_extending_files ${APP_DATA}/src/postgresql-start-hook ${CONTAINER_SCRIPTS_PATH}/postgresql-start-hook
+process_extending_files ${APP_DATA}/src/postgresql-start ${CONTAINER_SCRIPTS_PATH}/start
 
 pg_ctl stop
 

9.5/root/usr/share/container-scripts/postgresql/common.sh

@@ -252,18 +252,26 @@ $ s2i build ~/image-configuration/ postgresql new-postgresql
 The directory passed to `s2i build` should contain one or more of the
 following directories:
 
-##### `postgresql-config/`
+##### `postgresql-cfg/`
 
-contained configuration files (`*.conf`) will be included at the end of image postgresql.conf file during database initialization
+Contained configuration files (`*.conf`) will be included at the end of image
+postgresql.conf file.
 
 
 ##### `postgresql-init/`
 
-contained shell scripts (`*.sh`) are sourced once, when database is initialized
+Contained shell scripts (`*.sh`) are sourced when the database is freshly
+initialized (after successful initdb run which made the data directory
+non-empty).  At the time of sourcing these scripts, the local PostgreSQL
+server is running.  For re-deployments scenarios with persistent data
+directory, the scripts are not sourced (no-op).
 
-##### `postgresql-start-hook/`
 
-contained shell scripts (`*.sh`) are sourced before every start
+##### `postgresql-start/`
+
+Same sematics as `postgresql-init/`, except that these scripts are
+always sourced (after `postgresql-init/` scripts, if they exist).
+
 
 ----------------------------------------------
 

9.5/root/usr/share/container-scripts/postgresql/postgresql-init/set-config.sh

@@ -125,6 +125,13 @@ function generate_postgresql_config() {
         < "${CONTAINER_SCRIPTS_PATH}/openshift-custom-postgresql-replication.conf.template" \
         >> "${POSTGRESQL_CONFIG_FILE}"
   fi
+
+  (
+  shopt -s nullglob
+  for conf in "${APP_DATA}"/src/postgresql-cfg/*.conf; do
+    echo include \'${conf}\' >> "${POSTGRESQL_CONFIG_FILE}"
+  done
+  )
 }
 
 function generate_postgresql_recovery_config() {