From ba8d72cbb1a751933ae88072ce765f8658bb0be8 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 10 Mar 2022 15:16:44 +0000 Subject: [PATCH] 11.15.0-debian-10-r26 release --- .../postgresql-repmgr/11/debian-10/Dockerfile | 2 +- .../rootfs/opt/bitnami/scripts/librepmgr.sh | 24 ++++++++++++++++--- .../opt/bitnami/scripts/postgresql-env.sh | 8 +++---- bitnami/postgresql-repmgr/README.md | 12 +++++----- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/bitnami/postgresql-repmgr/11/debian-10/Dockerfile b/bitnami/postgresql-repmgr/11/debian-10/Dockerfile index d7404c77836b..8b5efc338737 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.15.0-debian-10-r25" \ + BITNAMI_IMAGE_VERSION="11.15.0-debian-10-r26" \ 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/librepmgr.sh b/bitnami/postgresql-repmgr/11/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh index c07fe6635895..abe1fea1c78c 100644 --- a/bitnami/postgresql-repmgr/11/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh +++ b/bitnami/postgresql-repmgr/11/debian-10/rootfs/opt/bitnami/scripts/librepmgr.sh @@ -495,7 +495,7 @@ pg_ctl_options='-o "--config-file=\"${POSTGRESQL_CONF_FILE}\" --external_pid_fil pg_basebackup_options='$waldir_option' EOF - if is_boolean_yes "$REPMGR_FENCE_OLD_PRIMARY"; then + if is_boolean_yes "$REPMGR_FENCE_OLD_PRIMARY"; then cat <>"${REPMGR_CONF_FILE}.tmp" child_nodes_disconnect_command='/bin/bash -c ". /opt/bitnami/scripts/libpostgresql.sh && . /opt/bitnami/scripts/postgresql-env.sh && postgresql_stop && kill -TERM 1"' EOF @@ -504,13 +504,11 @@ EOF child_nodes_check_interval=${REPMGR_CHILD_NODES_CHECK_INTERVAL} EOF fi - if [[ -v REPMGR_CHILD_NODES_CONNECTED_MIN_COUNT ]]; then cat <>"${REPMGR_CONF_FILE}.tmp" child_nodes_connected_min_count=${REPMGR_CHILD_NODES_CONNECTED_MIN_COUNT} EOF fi - if [[ -v REPMGR_CHILD_NODES_DISCONNECT_TIMEOUT ]]; then cat <>"${REPMGR_CONF_FILE}.tmp" child_nodes_disconnect_timeout=${REPMGR_CHILD_NODES_DISCONNECT_TIMEOUT} @@ -518,6 +516,26 @@ EOF fi fi + if [[ "$REPMGR_FENCE_OLD_PRIMARY" == "true" ]]; then + cat <>"${REPMGR_CONF_FILE}.tmp" +child_nodes_disconnect_command='/bin/bash -c ". /opt/bitnami/scripts/libpostgresql.sh && . /opt/bitnami/scripts/postgresql-env.sh && postgresql_stop && kill -TERM 1"' +EOF + if [[ -v REPMGR_CHILD_NODES_CHECK_INTERVAL ]]; then + cat <>"${REPMGR_CONF_FILE}.tmp" +child_nodes_check_interval=${REPMGR_CHILD_NODES_CHECK_INTERVAL} +EOF + fi + if [[ -v REPMGR_CHILD_NODES_CONNECTED_MIN_COUNT ]]; then + cat <>"${REPMGR_CONF_FILE}.tmp" +child_nodes_connected_min_count=${REPMGR_CHILD_NODES_CONNECTED_MIN_COUNT} +EOF + fi + if [[ -v REPMGR_CHILD_NODES_DISCONNECT_TIMEOUT ]]; then + cat <>"${REPMGR_CONF_FILE}.tmp" +child_nodes_disconnect_timeout=${REPMGR_CHILD_NODES_DISCONNECT_TIMEOUT} +EOF + fi + fi if [[ -f "${REPMGR_MOUNTED_CONF_DIR}/repmgr.conf" ]]; then # remove from default the overrided keys, and append the desired conf 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 8d684864f812..71ca92515286 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 @@ -110,6 +110,10 @@ postgresql_env_vars=( REPMGR_MASTER_RESPONSE_TIMEOUT REPMGR_DEGRADED_MONITORING_TIMEOUT REPMGR_UPGRADE_EXTENSION + REPMGR_FENCE_OLD_PRIMARY + REPMGR_CHILD_NODES_CHECK_INTERVAL + REPMGR_CHILD_NODES_CONNECTED_MIN_COUNT + REPMGR_CHILD_NODES_DISCONNECT_TIMEOUT REPMGR_SWITCH_ROLE REPMGR_USERNAME REPMGR_DATABASE @@ -117,10 +121,6 @@ postgresql_env_vars=( REPMGR_PASSWORD REPMGR_USE_PASSFILE REPMGR_PASSFILE_PATH - REPMGR_FENCE_OLD_PRIMARY - REPMGR_CHILD_NODES_CHECK_INTERVAL - REPMGR_CHILD_NODES_CONNECTED_MIN_COUNT - REPMGR_CHILD_NODES_DISCONNECT_TIMEOUT PGCONNECT_TIMEOUT POSTGRESQL_REPLICATION_PASSFILE_PATH POSTGRES_DATA_DIR diff --git a/bitnami/postgresql-repmgr/README.md b/bitnami/postgresql-repmgr/README.md index 9138af7c295c..e7df90b9e82c 100644 --- a/bitnami/postgresql-repmgr/README.md +++ b/bitnami/postgresql-repmgr/README.md @@ -52,7 +52,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`14`, `14-debian-10`, `14.2.0`, `14.2.0-debian-10-r23`, `latest` (14/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/14.2.0-debian-10-r23/14/debian-10/Dockerfile) * [`13`, `13-debian-10`, `13.6.0`, `13.6.0-debian-10-r26` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/13.6.0-debian-10-r26/13/debian-10/Dockerfile) * [`12`, `12-debian-10`, `12.10.0`, `12.10.0-debian-10-r26` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/12.10.0-debian-10-r26/12/debian-10/Dockerfile) -* [`11`, `11-debian-10`, `11.15.0`, `11.15.0-debian-10-r25` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/11.15.0-debian-10-r25/11/debian-10/Dockerfile) +* [`11`, `11-debian-10`, `11.15.0`, `11.15.0-debian-10-r26` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/11.15.0-debian-10-r26/11/debian-10/Dockerfile) * [`10`, `10-debian-10`, `10.20.0`, `10.20.0-debian-10-r29` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql-repmgr/blob/10.20.0-debian-10-r29/10/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/postgresql-repmgr GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql-repmgr). @@ -548,10 +548,10 @@ Please see the list of environment variables available in the Bitnami PostgreSQL | REPMGR_DATABASE | `repmgr` | | REPMGR_PASSWORD | `nil` | | REPMGR_PASSWORD_FILE | `nil` | -| REPMGR_FENCE_OLD_PRIMARY | `nil` | -| REPMGR_CHILD_NODES_CHECK_INTERVAL | `nil` | -| REPMGR_CHILD_NODES_CONNECTED_MIN_COUNT | `nil` | -| REPMGR_CHILD_NODES_DISCONNECT_TIMEOUT | `nil` | +| REPMGR_FENCE_OLD_PRIMARY | `no` | +| REPMGR_CHILD_NODES_CHECK_INTERVAL | `5` | +| REPMGR_CHILD_NODES_CONNECTED_MIN_COUNT | `1` | +| REPMGR_CHILD_NODES_DISCONNECT_TIMEOUT | `30` | | REPMGR_USE_PASSFILE | `nil` | | POSTGRESQL_USERNAME | `postgres` | | POSTGRESQL_DATABASE | `nil` | @@ -568,7 +568,7 @@ Please see the list of environment variables available in the Bitnami PostgreSQL | POSTGRESQL_TLS_KEY_FILE | `nil` | | POSTGRESQL_TLS_CA_FILE | `nil` | | POSTGRESQL_TLS_CRL_FILE | `nil` | -| POSTGRESQL_TLS_PREFER_SERVER_CIPHERS | `yes` | +| POSTGRESQL_TLS_PREFER_SERVER_CIPHERS | `yes` | ## Logging