From 1e4ce5e0870506c0d5a201b5f9b528127a95645f Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 5 Sep 2019 07:15:12 +0000
Subject: [PATCH] 4.0.6-centos-7-r3 release

---
 bitnami/pgpool/4/centos-7/Dockerfile          |  4 ++--
 bitnami/pgpool/4/centos-7/rootfs/libpgpool.sh | 19 ++++++++++---------
 bitnami/pgpool/4/centos-7/rootfs/run.sh       |  2 +-
 bitnami/pgpool/README.md                      |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/bitnami/pgpool/4/centos-7/Dockerfile b/bitnami/pgpool/4/centos-7/Dockerfile
index 50cad0c34ada..a8e6198b454c 100644
--- a/bitnami/pgpool/4/centos-7/Dockerfile
+++ b/bitnami/pgpool/4/centos-7/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/centos-extras-base:7-r125
+FROM bitnami/centos-extras-base:7-r126
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 ENV OS_ARCH="x86_64" \
@@ -13,7 +13,7 @@ RUN . ./libcomponent.sh && component_unpack "pgpool" "4.0.6-0" --checksum a0e3a5
 COPY rootfs /
 RUN /postunpack.sh
 ENV BITNAMI_APP_NAME="pgpool" \
-    BITNAMI_IMAGE_VERSION="4.0.6-centos-7-r2" \
+    BITNAMI_IMAGE_VERSION="4.0.6-centos-7-r3" \
     PATH="/opt/bitnami/postgresql/bin:/opt/bitnami/pgpool/bin:$PATH"
 
 EXPOSE 5432
diff --git a/bitnami/pgpool/4/centos-7/rootfs/libpgpool.sh b/bitnami/pgpool/4/centos-7/rootfs/libpgpool.sh
index 12941531fd10..8bc382c02eeb 100644
--- a/bitnami/pgpool/4/centos-7/rootfs/libpgpool.sh
+++ b/bitnami/pgpool/4/centos-7/rootfs/libpgpool.sh
@@ -317,19 +317,19 @@ base $PGPOOL_LDAP_BASE
 binddn $PGPOOL_LDAP_BIND_DN
 bindpw $PGPOOL_LDAP_BIND_PASSWORD
 EOF
-    if [[ -n "${DB_LDAP_BASE_LOOKUP}" ]]; then
+    if [[ -n "${PGPOOL_LDAP_BASE_LOOKUP}" ]]; then
         cat >> "/etc/nslcd.conf" << EOF
-base passwd $DB_LDAP_BASE_LOOKUP
+base passwd $PGPOOL_LDAP_BASE_LOOKUP
 EOF
     fi
-    if [[ -n "${DB_LDAP_SCOPE}" ]]; then
+    if [[ -n "${PGPOOL_LDAP_SCOPE}" ]]; then
         cat >> "/etc/nslcd.conf" << EOF
-scope $DB_LDAP_SCOPE
+scope $PGPOOL_LDAP_SCOPE
 EOF
     fi
-    if [[ -n "${DB_LDAP_TLS_REQCERT}" ]]; then
+    if [[ -n "${PGPOOL_LDAP_TLS_REQCERT}" ]]; then
             cat >> "/etc/nslcd.conf" << EOF
-tls_reqcert $DB_LDAP_TLS_REQCERT
+tls_reqcert $PGPOOL_LDAP_TLS_REQCERT
 EOF
     fi
     chmod 600 /etc/nslcd.conf
@@ -339,9 +339,10 @@ EOF
         centos-*|rhel-*|ol-*) openldap_conf=/etc/openldap/ldap.conf ;;
         *) ;;
     esac
-    sed -i "s/BASE.*/BASE  \"$PGPOOL_LDAP_BASE\"/" "${openldap_conf}"
-    sed -i "s/URI.*/URI    $PGPOOL_LDAP_URI/" "${openldap_conf}"
-    nslcd --debug &
+    cat >>"${openldap_conf}"<<EOF
+BASE $PGPOOL_LDAP_BASE
+URI $PGPOOL_LDAP_URI
+EOF
 }
 
 ########################
diff --git a/bitnami/pgpool/4/centos-7/rootfs/run.sh b/bitnami/pgpool/4/centos-7/rootfs/run.sh
index f6dc4ac75ad3..b295635e99e7 100755
--- a/bitnami/pgpool/4/centos-7/rootfs/run.sh
+++ b/bitnami/pgpool/4/centos-7/rootfs/run.sh
@@ -20,7 +20,7 @@ readonly command=$(command -v pgpool)
 flags=("-n" "--config-file=${PGPOOL_CONF_FILE}" "--hba-file=${PGPOOL_PGHBA_FILE}")
 [[ -z "${PGPOOL_EXTRA_FLAGS:-}" ]] || flags=("${flags[@]}" "${PGPOOL_EXTRA_FLAGS[@]}")
 
-is_boolean_yes "$PGPOOL_ENABLE_LDAP" && pgpool_start_nslcd
+is_boolean_yes "$PGPOOL_ENABLE_LDAP" && pgpool_start_nslcd_bg
 info "** Starting Pgpool-II **"
 if am_i_root; then
     exec gosu "$PGPOOL_DAEMON_USER" "${command}" "${flags[@]}"
diff --git a/bitnami/pgpool/README.md b/bitnami/pgpool/README.md
index ff24cb12d51a..c1cb082c57fe 100644
--- a/bitnami/pgpool/README.md
+++ b/bitnami/pgpool/README.md
@@ -41,7 +41,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 * [`4-ol-7`, `4.0.6-ol-7-r3` (4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.0.6-ol-7-r3/4/ol-7/Dockerfile)
 * [`4-debian-9`, `4.0.6-debian-9-r3`, `4`, `4.0.6`, `4.0.6-r3`, `latest` (4/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.0.6-debian-9-r3/4/debian-9/Dockerfile)
-* [`4-centos-7`, `4.0.6-centos-7-r2` (4/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.0.6-centos-7-r2/4/centos-7/Dockerfile)
+* [`4-centos-7`, `4.0.6-centos-7-r3` (4/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.0.6-centos-7-r3/4/centos-7/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/pgpool GitHub repo](https://github.com/bitnami/bitnami-docker-pgpool).