From dfa7339dcc342e15fd2d16abe0af169aca01e9d0 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 9 Oct 2020 14:38:43 +0000
Subject: [PATCH] 11.9.0-debian-10-r57 release

---
 bitnami/postgresql-repmgr/11/debian-10/Dockerfile  |  2 +-
 .../rootfs/opt/bitnami/scripts/libpostgresql.sh    | 14 ++++++++++++++
 .../rootfs/opt/bitnami/scripts/postgresql-env.sh   |  4 ++++
 bitnami/postgresql-repmgr/README.md                |  2 +-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/bitnami/postgresql-repmgr/11/debian-10/Dockerfile b/bitnami/postgresql-repmgr/11/debian-10/Dockerfile
index f2b8da3874c6..e523b8c7eae7 100644
--- a/bitnami/postgresql-repmgr/11/debian-10/Dockerfile
+++ b/bitnami/postgresql-repmgr/11/debian-10/Dockerfile
@@ -24,7 +24,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/postgresql-repmgr/postunpack.sh
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 ENV BITNAMI_APP_NAME="postgresql-repmgr" \
-    BITNAMI_IMAGE_VERSION="11.9.0-debian-10-r56" \
+    BITNAMI_IMAGE_VERSION="11.9.0-debian-10-r57" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/postgresql-repmgr/11/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql-repmgr/11/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
index 192ddf6b98ae..db085a5f95b6 100644
--- a/bitnami/postgresql-repmgr/11/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
+++ b/bitnami/postgresql-repmgr/11/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
@@ -627,6 +627,7 @@ postgresql_initialize() {
     is_boolean_yes "$create_conf_file" && [[ -n "$POSTGRESQL_SHARED_PRELOAD_LIBRARIES" ]] && postgresql_set_property "shared_preload_libraries" "$POSTGRESQL_SHARED_PRELOAD_LIBRARIES"
     is_boolean_yes "$create_conf_file" && postgresql_configure_logging
     is_boolean_yes "$create_conf_file" && postgresql_configure_connections
+    is_boolean_yes "$create_conf_file" && postgresql_configure_timezone
 
     # Delete conf files generated on first run
     rm -f "$POSTGRESQL_DATA_DIR"/postgresql.conf "$POSTGRESQL_DATA_DIR"/pg_hba.conf
@@ -967,6 +968,19 @@ postgresql_configure_connections() {
     ([[ -n "$POSTGRESQL_STATEMENT_TIMEOUT" ]] && postgresql_set_property "statement_timeout" "$POSTGRESQL_STATEMENT_TIMEOUT") || true
 }
 
+########################
+# Configure timezone
+# Globals:
+#   POSTGRESQL_*
+# Arguments:
+#   None
+# Returns:
+#   Boolean
+#########################
+postgresql_configure_timezone() {
+    ([[ -n "$POSTGRESQL_TIMEZONE" ]] && postgresql_set_property "timezone" "$POSTGRESQL_TIMEZONE") || true
+}
+
 ########################
 # Remove pg_hba.conf lines based on filter
 # Globals:
diff --git a/bitnami/postgresql-repmgr/11/debian-10/rootfs/opt/bitnami/scripts/postgresql-env.sh b/bitnami/postgresql-repmgr/11/debian-10/rootfs/opt/bitnami/scripts/postgresql-env.sh
index 21dbd0f9dcec..9e1df6f9748e 100644
--- a/bitnami/postgresql-repmgr/11/debian-10/rootfs/opt/bitnami/scripts/postgresql-env.sh
+++ b/bitnami/postgresql-repmgr/11/debian-10/rootfs/opt/bitnami/scripts/postgresql-env.sh
@@ -68,6 +68,7 @@ postgresql_env_vars=(
     POSTGRESQL_CLIENT_MIN_MESSAGES
     POSTGRESQL_LOG_LINE_PREFIX
     POSTGRESQL_LOG_TIMEZONE
+    POSTGRESQL_TIMEZONE
     POSTGRESQL_MAX_CONNECTIONS
     POSTGRESQL_TCP_KEEPALIVES_IDLE
     POSTGRESQL_TCP_KEEPALIVES_INTERVAL
@@ -152,6 +153,7 @@ postgresql_env_vars=(
     POSTGRES_CLIENT_MIN_MESSAGES
     POSTGRES_LOG_LINE_PREFIX
     POSTGRES_LOG_TIMEZONE
+    POSTGRES_TIMEZONE
     POSTGRES_MAX_CONNECTIONS
     POSTGRES_TCP_KEEPALIVES_IDLE
     POSTGRES_TCP_KEEPALIVES_INTERVAL
@@ -295,6 +297,8 @@ POSTGRESQL_LOG_LINE_PREFIX="${POSTGRESQL_LOG_LINE_PREFIX:-"${POSTGRES_LOG_LINE_P
 export POSTGRESQL_LOG_LINE_PREFIX="${POSTGRESQL_LOG_LINE_PREFIX:-}"
 POSTGRESQL_LOG_TIMEZONE="${POSTGRESQL_LOG_TIMEZONE:-"${POSTGRES_LOG_TIMEZONE:-}"}"
 export POSTGRESQL_LOG_TIMEZONE="${POSTGRESQL_LOG_TIMEZONE:-}"
+POSTGRESQL_TIMEZONE="${POSTGRESQL_TIMEZONE:-"${POSTGRES_TIMEZONE:-}"}"
+export POSTGRESQL_TIMEZONE="${POSTGRESQL_TIMEZONE:-}"
 POSTGRESQL_MAX_CONNECTIONS="${POSTGRESQL_MAX_CONNECTIONS:-"${POSTGRES_MAX_CONNECTIONS:-}"}"
 export POSTGRESQL_MAX_CONNECTIONS="${POSTGRESQL_MAX_CONNECTIONS:-}"
 POSTGRESQL_TCP_KEEPALIVES_IDLE="${POSTGRESQL_TCP_KEEPALIVES_IDLE:-"${POSTGRES_TCP_KEEPALIVES_IDLE:-}"}"
diff --git a/bitnami/postgresql-repmgr/README.md b/bitnami/postgresql-repmgr/README.md
index 85e5d180ee1e..1f49c874f8da 100644
--- a/bitnami/postgresql-repmgr/README.md
+++ b/bitnami/postgresql-repmgr/README.md
@@ -45,7 +45,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 * [`13`, `13-debian-10`, `13.0.0`, `13.0.0-debian-10-r7` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/13.0.0-debian-10-r7/13/debian-10/Dockerfile)
 * [`12`, `12-debian-10`, `12.4.0`, `12.4.0-debian-10-r60` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/12.4.0-debian-10-r60/12/debian-10/Dockerfile)
-* [`11`, `11-debian-10`, `11.9.0`, `11.9.0-debian-10-r56`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/11.9.0-debian-10-r56/11/debian-10/Dockerfile)
+* [`11`, `11-debian-10`, `11.9.0`, `11.9.0-debian-10-r57`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/11.9.0-debian-10-r57/11/debian-10/Dockerfile)
 * [`10`, `10-debian-10`, `10.14.0`, `10.14.0-debian-10-r61` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.14.0-debian-10-r61/10/debian-10/Dockerfile)
 * [`9.6`, `9.6-debian-10`, `9.6.19`, `9.6.19-debian-10-r60` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/9.6.19-debian-10-r60/9.6/debian-10/Dockerfile)