From cb3ba42f64b01ea30065c62285a9bc1967b30d27 Mon Sep 17 00:00:00 2001
From: Alessandro Cerioni <acerioni@grandlyon.com>
Date: Wed, 24 Jul 2019 20:18:36 +0200
Subject: [PATCH] Making sure that the POSTGRESQL_MASTER_PORT_NUMBER
 environment variable is actually taken into account when replicating the
 initial database

---
 bitnami/postgresql/10/centos-7/rootfs/libpostgresql.sh  | 2 +-
 bitnami/postgresql/10/debian-9/rootfs/libpostgresql.sh  | 2 +-
 bitnami/postgresql/10/ol-7/rootfs/libpostgresql.sh      | 2 +-
 bitnami/postgresql/11/centos-7/rootfs/libpostgresql.sh  | 2 +-
 bitnami/postgresql/11/debian-9/rootfs/libpostgresql.sh  | 2 +-
 bitnami/postgresql/11/ol-7/rootfs/libpostgresql.sh      | 2 +-
 bitnami/postgresql/9.6/centos-7/rootfs/libpostgresql.sh | 2 +-
 bitnami/postgresql/9.6/debian-9/rootfs/libpostgresql.sh | 2 +-
 bitnami/postgresql/9.6/ol-7/rootfs/libpostgresql.sh     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bitnami/postgresql/10/centos-7/rootfs/libpostgresql.sh b/bitnami/postgresql/10/centos-7/rootfs/libpostgresql.sh
index 4fb94a14f9f5..52485f744a52 100644
--- a/bitnami/postgresql/10/centos-7/rootfs/libpostgresql.sh
+++ b/bitnami/postgresql/10/centos-7/rootfs/libpostgresql.sh
@@ -716,7 +716,7 @@ postgresql_slave_init_db() {
 
     done
     info "Replicating the initial database"
-    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-X" "stream" "-w" "-v" "-P")
+    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-p" "$POSTGRESQL_MASTER_PORT_NUMBER" "-X" "stream" "-w" "-v" "-P")
     local -r backup_cmd=("$POSTGRESQL_BIN_DIR"/pg_basebackup)
     local replication_counter=$POSTGRESQL_INIT_MAX_TIMEOUT
     while ! PGPASSWORD=$POSTGRESQL_REPLICATION_PASSWORD "${backup_cmd[@]}" "${backup_args[@]}";do
diff --git a/bitnami/postgresql/10/debian-9/rootfs/libpostgresql.sh b/bitnami/postgresql/10/debian-9/rootfs/libpostgresql.sh
index 4fb94a14f9f5..52485f744a52 100644
--- a/bitnami/postgresql/10/debian-9/rootfs/libpostgresql.sh
+++ b/bitnami/postgresql/10/debian-9/rootfs/libpostgresql.sh
@@ -716,7 +716,7 @@ postgresql_slave_init_db() {
 
     done
     info "Replicating the initial database"
-    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-X" "stream" "-w" "-v" "-P")
+    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-p" "$POSTGRESQL_MASTER_PORT_NUMBER" "-X" "stream" "-w" "-v" "-P")
     local -r backup_cmd=("$POSTGRESQL_BIN_DIR"/pg_basebackup)
     local replication_counter=$POSTGRESQL_INIT_MAX_TIMEOUT
     while ! PGPASSWORD=$POSTGRESQL_REPLICATION_PASSWORD "${backup_cmd[@]}" "${backup_args[@]}";do
diff --git a/bitnami/postgresql/10/ol-7/rootfs/libpostgresql.sh b/bitnami/postgresql/10/ol-7/rootfs/libpostgresql.sh
index 4fb94a14f9f5..52485f744a52 100644
--- a/bitnami/postgresql/10/ol-7/rootfs/libpostgresql.sh
+++ b/bitnami/postgresql/10/ol-7/rootfs/libpostgresql.sh
@@ -716,7 +716,7 @@ postgresql_slave_init_db() {
 
     done
     info "Replicating the initial database"
-    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-X" "stream" "-w" "-v" "-P")
+    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-p" "$POSTGRESQL_MASTER_PORT_NUMBER" "-X" "stream" "-w" "-v" "-P")
     local -r backup_cmd=("$POSTGRESQL_BIN_DIR"/pg_basebackup)
     local replication_counter=$POSTGRESQL_INIT_MAX_TIMEOUT
     while ! PGPASSWORD=$POSTGRESQL_REPLICATION_PASSWORD "${backup_cmd[@]}" "${backup_args[@]}";do
diff --git a/bitnami/postgresql/11/centos-7/rootfs/libpostgresql.sh b/bitnami/postgresql/11/centos-7/rootfs/libpostgresql.sh
index 4fb94a14f9f5..52485f744a52 100644
--- a/bitnami/postgresql/11/centos-7/rootfs/libpostgresql.sh
+++ b/bitnami/postgresql/11/centos-7/rootfs/libpostgresql.sh
@@ -716,7 +716,7 @@ postgresql_slave_init_db() {
 
     done
     info "Replicating the initial database"
-    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-X" "stream" "-w" "-v" "-P")
+    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-p" "$POSTGRESQL_MASTER_PORT_NUMBER" "-X" "stream" "-w" "-v" "-P")
     local -r backup_cmd=("$POSTGRESQL_BIN_DIR"/pg_basebackup)
     local replication_counter=$POSTGRESQL_INIT_MAX_TIMEOUT
     while ! PGPASSWORD=$POSTGRESQL_REPLICATION_PASSWORD "${backup_cmd[@]}" "${backup_args[@]}";do
diff --git a/bitnami/postgresql/11/debian-9/rootfs/libpostgresql.sh b/bitnami/postgresql/11/debian-9/rootfs/libpostgresql.sh
index 4fb94a14f9f5..52485f744a52 100644
--- a/bitnami/postgresql/11/debian-9/rootfs/libpostgresql.sh
+++ b/bitnami/postgresql/11/debian-9/rootfs/libpostgresql.sh
@@ -716,7 +716,7 @@ postgresql_slave_init_db() {
 
     done
     info "Replicating the initial database"
-    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-X" "stream" "-w" "-v" "-P")
+    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-p" "$POSTGRESQL_MASTER_PORT_NUMBER" "-X" "stream" "-w" "-v" "-P")
     local -r backup_cmd=("$POSTGRESQL_BIN_DIR"/pg_basebackup)
     local replication_counter=$POSTGRESQL_INIT_MAX_TIMEOUT
     while ! PGPASSWORD=$POSTGRESQL_REPLICATION_PASSWORD "${backup_cmd[@]}" "${backup_args[@]}";do
diff --git a/bitnami/postgresql/11/ol-7/rootfs/libpostgresql.sh b/bitnami/postgresql/11/ol-7/rootfs/libpostgresql.sh
index 4fb94a14f9f5..52485f744a52 100644
--- a/bitnami/postgresql/11/ol-7/rootfs/libpostgresql.sh
+++ b/bitnami/postgresql/11/ol-7/rootfs/libpostgresql.sh
@@ -716,7 +716,7 @@ postgresql_slave_init_db() {
 
     done
     info "Replicating the initial database"
-    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-X" "stream" "-w" "-v" "-P")
+    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-p" "$POSTGRESQL_MASTER_PORT_NUMBER" "-X" "stream" "-w" "-v" "-P")
     local -r backup_cmd=("$POSTGRESQL_BIN_DIR"/pg_basebackup)
     local replication_counter=$POSTGRESQL_INIT_MAX_TIMEOUT
     while ! PGPASSWORD=$POSTGRESQL_REPLICATION_PASSWORD "${backup_cmd[@]}" "${backup_args[@]}";do
diff --git a/bitnami/postgresql/9.6/centos-7/rootfs/libpostgresql.sh b/bitnami/postgresql/9.6/centos-7/rootfs/libpostgresql.sh
index 4fb94a14f9f5..52485f744a52 100644
--- a/bitnami/postgresql/9.6/centos-7/rootfs/libpostgresql.sh
+++ b/bitnami/postgresql/9.6/centos-7/rootfs/libpostgresql.sh
@@ -716,7 +716,7 @@ postgresql_slave_init_db() {
 
     done
     info "Replicating the initial database"
-    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-X" "stream" "-w" "-v" "-P")
+    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-p" "$POSTGRESQL_MASTER_PORT_NUMBER" "-X" "stream" "-w" "-v" "-P")
     local -r backup_cmd=("$POSTGRESQL_BIN_DIR"/pg_basebackup)
     local replication_counter=$POSTGRESQL_INIT_MAX_TIMEOUT
     while ! PGPASSWORD=$POSTGRESQL_REPLICATION_PASSWORD "${backup_cmd[@]}" "${backup_args[@]}";do
diff --git a/bitnami/postgresql/9.6/debian-9/rootfs/libpostgresql.sh b/bitnami/postgresql/9.6/debian-9/rootfs/libpostgresql.sh
index 4fb94a14f9f5..52485f744a52 100644
--- a/bitnami/postgresql/9.6/debian-9/rootfs/libpostgresql.sh
+++ b/bitnami/postgresql/9.6/debian-9/rootfs/libpostgresql.sh
@@ -716,7 +716,7 @@ postgresql_slave_init_db() {
 
     done
     info "Replicating the initial database"
-    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-X" "stream" "-w" "-v" "-P")
+    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-p" "$POSTGRESQL_MASTER_PORT_NUMBER" "-X" "stream" "-w" "-v" "-P")
     local -r backup_cmd=("$POSTGRESQL_BIN_DIR"/pg_basebackup)
     local replication_counter=$POSTGRESQL_INIT_MAX_TIMEOUT
     while ! PGPASSWORD=$POSTGRESQL_REPLICATION_PASSWORD "${backup_cmd[@]}" "${backup_args[@]}";do
diff --git a/bitnami/postgresql/9.6/ol-7/rootfs/libpostgresql.sh b/bitnami/postgresql/9.6/ol-7/rootfs/libpostgresql.sh
index 4fb94a14f9f5..52485f744a52 100644
--- a/bitnami/postgresql/9.6/ol-7/rootfs/libpostgresql.sh
+++ b/bitnami/postgresql/9.6/ol-7/rootfs/libpostgresql.sh
@@ -716,7 +716,7 @@ postgresql_slave_init_db() {
 
     done
     info "Replicating the initial database"
-    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-X" "stream" "-w" "-v" "-P")
+    local -r backup_args=("-D" "$POSTGRESQL_DATA_DIR" "-U" "$POSTGRESQL_REPLICATION_USER" "-h" "$POSTGRESQL_MASTER_HOST" "-p" "$POSTGRESQL_MASTER_PORT_NUMBER" "-X" "stream" "-w" "-v" "-P")
     local -r backup_cmd=("$POSTGRESQL_BIN_DIR"/pg_basebackup)
     local replication_counter=$POSTGRESQL_INIT_MAX_TIMEOUT
     while ! PGPASSWORD=$POSTGRESQL_REPLICATION_PASSWORD "${backup_cmd[@]}" "${backup_args[@]}";do