From 6ea54b59a63c0b33bae0bf5de68e0275c7411c25 Mon Sep 17 00:00:00 2001
From: Nuno Fernandes <nuno.fernandes@gmail.com>
Date: Tue, 4 Jul 2023 17:20:31 +0100
Subject: [PATCH] [feature] [postgresql] Add support for setting the
 password_encryption (#38424)

Add support for setting the password_encryption

Signed-off-by: Nuno Fernandes <nuno.fernandes@gmail.com>
---
 .../11/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh    | 1 +
 .../11/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh   | 2 ++
 .../12/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh    | 1 +
 .../12/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh   | 2 ++
 .../13/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh    | 1 +
 .../13/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh   | 2 ++
 .../14/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh    | 1 +
 .../14/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh   | 2 ++
 .../15/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh    | 1 +
 .../15/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh   | 2 ++
 10 files changed, 15 insertions(+)

diff --git a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh
index 980333b2b056..572dd54b60d7 100644
--- a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh
+++ b/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh
@@ -622,6 +622,7 @@ postgresql_initialize() {
     # Configure port
     postgresql_set_property "port" "$POSTGRESQL_PORT_NUMBER"
     is_empty_value "$POSTGRESQL_DEFAULT_TOAST_COMPRESSION" || postgresql_set_property "default_toast_compression" "$POSTGRESQL_DEFAULT_TOAST_COMPRESSION"
+    is_empty_value "$POSTGRESQL_PASSWORD_ENCRYPTION" || postgresql_set_property "password_encryption" "$POSTGRESQL_PASSWORD_ENCRYPTION"
     if ! is_dir_empty "$POSTGRESQL_DATA_DIR"; then
         info "Deploying PostgreSQL with persisted data..."
         export POSTGRESQL_FIRST_BOOT="no"
diff --git a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh b/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh
index f236d47daf18..d35ec5a62e51 100644
--- a/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh
+++ b/bitnami/postgresql/11/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh
@@ -91,6 +91,7 @@ postgresql_env_vars=(
     POSTGRESQL_POSTGRES_CONNECTION_LIMIT
     POSTGRESQL_WAL_LEVEL
     POSTGRESQL_DEFAULT_TOAST_COMPRESSION
+    POSTGRESQL_PASSWORD_ENCRYPTION
     POSTGRESQL_AUTOCTL_CONF_DIR
     POSTGRESQL_AUTOCTL_MODE
     POSTGRESQL_AUTOCTL_MONITOR_HOST
@@ -325,6 +326,7 @@ POSTGRESQL_POSTGRES_CONNECTION_LIMIT="${POSTGRESQL_POSTGRES_CONNECTION_LIMIT:-"$
 export POSTGRESQL_POSTGRES_CONNECTION_LIMIT="${POSTGRESQL_POSTGRES_CONNECTION_LIMIT:-}"
 export POSTGRESQL_WAL_LEVEL="${POSTGRESQL_WAL_LEVEL:-replica}"
 export POSTGRESQL_DEFAULT_TOAST_COMPRESSION="${POSTGRESQL_DEFAULT_TOAST_COMPRESSION:-}"
+export POSTGRESQL_PASSWORD_ENCRYPTION="${POSTGRESQL_PASSWORD_ENCRYPTION:-}"
 
 # pgAutoFailover settings
 export POSTGRESQL_AUTOCTL_VOLUME_DIR="${POSTGRESQL_VOLUME_DIR}/pgautoctl"
diff --git a/bitnami/postgresql/12/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql/12/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh
index 980333b2b056..572dd54b60d7 100644
--- a/bitnami/postgresql/12/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh
+++ b/bitnami/postgresql/12/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh
@@ -622,6 +622,7 @@ postgresql_initialize() {
     # Configure port
     postgresql_set_property "port" "$POSTGRESQL_PORT_NUMBER"
     is_empty_value "$POSTGRESQL_DEFAULT_TOAST_COMPRESSION" || postgresql_set_property "default_toast_compression" "$POSTGRESQL_DEFAULT_TOAST_COMPRESSION"
+    is_empty_value "$POSTGRESQL_PASSWORD_ENCRYPTION" || postgresql_set_property "password_encryption" "$POSTGRESQL_PASSWORD_ENCRYPTION"
     if ! is_dir_empty "$POSTGRESQL_DATA_DIR"; then
         info "Deploying PostgreSQL with persisted data..."
         export POSTGRESQL_FIRST_BOOT="no"
diff --git a/bitnami/postgresql/12/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh b/bitnami/postgresql/12/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh
index f236d47daf18..d35ec5a62e51 100644
--- a/bitnami/postgresql/12/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh
+++ b/bitnami/postgresql/12/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh
@@ -91,6 +91,7 @@ postgresql_env_vars=(
     POSTGRESQL_POSTGRES_CONNECTION_LIMIT
     POSTGRESQL_WAL_LEVEL
     POSTGRESQL_DEFAULT_TOAST_COMPRESSION
+    POSTGRESQL_PASSWORD_ENCRYPTION
     POSTGRESQL_AUTOCTL_CONF_DIR
     POSTGRESQL_AUTOCTL_MODE
     POSTGRESQL_AUTOCTL_MONITOR_HOST
@@ -325,6 +326,7 @@ POSTGRESQL_POSTGRES_CONNECTION_LIMIT="${POSTGRESQL_POSTGRES_CONNECTION_LIMIT:-"$
 export POSTGRESQL_POSTGRES_CONNECTION_LIMIT="${POSTGRESQL_POSTGRES_CONNECTION_LIMIT:-}"
 export POSTGRESQL_WAL_LEVEL="${POSTGRESQL_WAL_LEVEL:-replica}"
 export POSTGRESQL_DEFAULT_TOAST_COMPRESSION="${POSTGRESQL_DEFAULT_TOAST_COMPRESSION:-}"
+export POSTGRESQL_PASSWORD_ENCRYPTION="${POSTGRESQL_PASSWORD_ENCRYPTION:-}"
 
 # pgAutoFailover settings
 export POSTGRESQL_AUTOCTL_VOLUME_DIR="${POSTGRESQL_VOLUME_DIR}/pgautoctl"
diff --git a/bitnami/postgresql/13/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql/13/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh
index 980333b2b056..572dd54b60d7 100644
--- a/bitnami/postgresql/13/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh
+++ b/bitnami/postgresql/13/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh
@@ -622,6 +622,7 @@ postgresql_initialize() {
     # Configure port
     postgresql_set_property "port" "$POSTGRESQL_PORT_NUMBER"
     is_empty_value "$POSTGRESQL_DEFAULT_TOAST_COMPRESSION" || postgresql_set_property "default_toast_compression" "$POSTGRESQL_DEFAULT_TOAST_COMPRESSION"
+    is_empty_value "$POSTGRESQL_PASSWORD_ENCRYPTION" || postgresql_set_property "password_encryption" "$POSTGRESQL_PASSWORD_ENCRYPTION"
     if ! is_dir_empty "$POSTGRESQL_DATA_DIR"; then
         info "Deploying PostgreSQL with persisted data..."
         export POSTGRESQL_FIRST_BOOT="no"
diff --git a/bitnami/postgresql/13/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh b/bitnami/postgresql/13/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh
index f236d47daf18..d35ec5a62e51 100644
--- a/bitnami/postgresql/13/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh
+++ b/bitnami/postgresql/13/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh
@@ -91,6 +91,7 @@ postgresql_env_vars=(
     POSTGRESQL_POSTGRES_CONNECTION_LIMIT
     POSTGRESQL_WAL_LEVEL
     POSTGRESQL_DEFAULT_TOAST_COMPRESSION
+    POSTGRESQL_PASSWORD_ENCRYPTION
     POSTGRESQL_AUTOCTL_CONF_DIR
     POSTGRESQL_AUTOCTL_MODE
     POSTGRESQL_AUTOCTL_MONITOR_HOST
@@ -325,6 +326,7 @@ POSTGRESQL_POSTGRES_CONNECTION_LIMIT="${POSTGRESQL_POSTGRES_CONNECTION_LIMIT:-"$
 export POSTGRESQL_POSTGRES_CONNECTION_LIMIT="${POSTGRESQL_POSTGRES_CONNECTION_LIMIT:-}"
 export POSTGRESQL_WAL_LEVEL="${POSTGRESQL_WAL_LEVEL:-replica}"
 export POSTGRESQL_DEFAULT_TOAST_COMPRESSION="${POSTGRESQL_DEFAULT_TOAST_COMPRESSION:-}"
+export POSTGRESQL_PASSWORD_ENCRYPTION="${POSTGRESQL_PASSWORD_ENCRYPTION:-}"
 
 # pgAutoFailover settings
 export POSTGRESQL_AUTOCTL_VOLUME_DIR="${POSTGRESQL_VOLUME_DIR}/pgautoctl"
diff --git a/bitnami/postgresql/14/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql/14/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh
index 980333b2b056..572dd54b60d7 100644
--- a/bitnami/postgresql/14/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh
+++ b/bitnami/postgresql/14/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh
@@ -622,6 +622,7 @@ postgresql_initialize() {
     # Configure port
     postgresql_set_property "port" "$POSTGRESQL_PORT_NUMBER"
     is_empty_value "$POSTGRESQL_DEFAULT_TOAST_COMPRESSION" || postgresql_set_property "default_toast_compression" "$POSTGRESQL_DEFAULT_TOAST_COMPRESSION"
+    is_empty_value "$POSTGRESQL_PASSWORD_ENCRYPTION" || postgresql_set_property "password_encryption" "$POSTGRESQL_PASSWORD_ENCRYPTION"
     if ! is_dir_empty "$POSTGRESQL_DATA_DIR"; then
         info "Deploying PostgreSQL with persisted data..."
         export POSTGRESQL_FIRST_BOOT="no"
diff --git a/bitnami/postgresql/14/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh b/bitnami/postgresql/14/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh
index f236d47daf18..d35ec5a62e51 100644
--- a/bitnami/postgresql/14/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh
+++ b/bitnami/postgresql/14/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh
@@ -91,6 +91,7 @@ postgresql_env_vars=(
     POSTGRESQL_POSTGRES_CONNECTION_LIMIT
     POSTGRESQL_WAL_LEVEL
     POSTGRESQL_DEFAULT_TOAST_COMPRESSION
+    POSTGRESQL_PASSWORD_ENCRYPTION
     POSTGRESQL_AUTOCTL_CONF_DIR
     POSTGRESQL_AUTOCTL_MODE
     POSTGRESQL_AUTOCTL_MONITOR_HOST
@@ -325,6 +326,7 @@ POSTGRESQL_POSTGRES_CONNECTION_LIMIT="${POSTGRESQL_POSTGRES_CONNECTION_LIMIT:-"$
 export POSTGRESQL_POSTGRES_CONNECTION_LIMIT="${POSTGRESQL_POSTGRES_CONNECTION_LIMIT:-}"
 export POSTGRESQL_WAL_LEVEL="${POSTGRESQL_WAL_LEVEL:-replica}"
 export POSTGRESQL_DEFAULT_TOAST_COMPRESSION="${POSTGRESQL_DEFAULT_TOAST_COMPRESSION:-}"
+export POSTGRESQL_PASSWORD_ENCRYPTION="${POSTGRESQL_PASSWORD_ENCRYPTION:-}"
 
 # pgAutoFailover settings
 export POSTGRESQL_AUTOCTL_VOLUME_DIR="${POSTGRESQL_VOLUME_DIR}/pgautoctl"
diff --git a/bitnami/postgresql/15/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql/15/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh
index 980333b2b056..572dd54b60d7 100644
--- a/bitnami/postgresql/15/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh
+++ b/bitnami/postgresql/15/debian-11/rootfs/opt/bitnami/scripts/libpostgresql.sh
@@ -622,6 +622,7 @@ postgresql_initialize() {
     # Configure port
     postgresql_set_property "port" "$POSTGRESQL_PORT_NUMBER"
     is_empty_value "$POSTGRESQL_DEFAULT_TOAST_COMPRESSION" || postgresql_set_property "default_toast_compression" "$POSTGRESQL_DEFAULT_TOAST_COMPRESSION"
+    is_empty_value "$POSTGRESQL_PASSWORD_ENCRYPTION" || postgresql_set_property "password_encryption" "$POSTGRESQL_PASSWORD_ENCRYPTION"
     if ! is_dir_empty "$POSTGRESQL_DATA_DIR"; then
         info "Deploying PostgreSQL with persisted data..."
         export POSTGRESQL_FIRST_BOOT="no"
diff --git a/bitnami/postgresql/15/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh b/bitnami/postgresql/15/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh
index f236d47daf18..d35ec5a62e51 100644
--- a/bitnami/postgresql/15/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh
+++ b/bitnami/postgresql/15/debian-11/rootfs/opt/bitnami/scripts/postgresql-env.sh
@@ -91,6 +91,7 @@ postgresql_env_vars=(
     POSTGRESQL_POSTGRES_CONNECTION_LIMIT
     POSTGRESQL_WAL_LEVEL
     POSTGRESQL_DEFAULT_TOAST_COMPRESSION
+    POSTGRESQL_PASSWORD_ENCRYPTION
     POSTGRESQL_AUTOCTL_CONF_DIR
     POSTGRESQL_AUTOCTL_MODE
     POSTGRESQL_AUTOCTL_MONITOR_HOST
@@ -325,6 +326,7 @@ POSTGRESQL_POSTGRES_CONNECTION_LIMIT="${POSTGRESQL_POSTGRES_CONNECTION_LIMIT:-"$
 export POSTGRESQL_POSTGRES_CONNECTION_LIMIT="${POSTGRESQL_POSTGRES_CONNECTION_LIMIT:-}"
 export POSTGRESQL_WAL_LEVEL="${POSTGRESQL_WAL_LEVEL:-replica}"
 export POSTGRESQL_DEFAULT_TOAST_COMPRESSION="${POSTGRESQL_DEFAULT_TOAST_COMPRESSION:-}"
+export POSTGRESQL_PASSWORD_ENCRYPTION="${POSTGRESQL_PASSWORD_ENCRYPTION:-}"
 
 # pgAutoFailover settings
 export POSTGRESQL_AUTOCTL_VOLUME_DIR="${POSTGRESQL_VOLUME_DIR}/pgautoctl"