From 5b055bd2a37500264b49a2034183bb78398e3f88 Mon Sep 17 00:00:00 2001 From: Celia Garcia Marquez Date: Wed, 20 Sep 2023 10:34:33 +0200 Subject: [PATCH 1/2] [bitnami/pgbouncer] Fix typo from libpgbouncer.sh Signed-off-by: Celia Garcia Marquez --- .../1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh index c2bff4e57c459..be05d9ae305a0 100644 --- a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh +++ b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh @@ -203,7 +203,8 @@ pgbouncer_initialize() { info "Configuring credentials" # Create credentials file if ! pgbouncer_is_file_external "userlist.txt"; then - echo "pgbouncer_escape_auth $POSTGRESQL_USERNAME" "pgbouncer_escape_auth $POSTGRESQL_PASSWORD" > "$PGBOUNCER_AUTH_FILE" + echo "\""$(pgbouncer_escape_auth "$POSTGRESQL_USERNAME")"\" \""$(pgbouncer_escape_auth "$POSTGRESQL_PASSWORD")"\"" \ + > "$PGBOUNCER_AUTH_FILE" echo "$PGBOUNCER_USERLIST" >> "$PGBOUNCER_AUTH_FILE" else debug "User list file mounted externally, skipping configuration" From 134db0406418f374a3ba9f196d789ad5367a8a31 Mon Sep 17 00:00:00 2001 From: Celia Garcia Marquez Date: Wed, 20 Sep 2023 11:04:38 +0200 Subject: [PATCH 2/2] [bitnami/pgbouncer] Fix linter Signed-off-by: Celia Garcia Marquez --- .../1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh index be05d9ae305a0..027986c843615 100644 --- a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh +++ b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh @@ -203,7 +203,7 @@ pgbouncer_initialize() { info "Configuring credentials" # Create credentials file if ! pgbouncer_is_file_external "userlist.txt"; then - echo "\""$(pgbouncer_escape_auth "$POSTGRESQL_USERNAME")"\" \""$(pgbouncer_escape_auth "$POSTGRESQL_PASSWORD")"\"" \ + echo "\"$(pgbouncer_escape_auth "$POSTGRESQL_USERNAME")\" \"$(pgbouncer_escape_auth "$POSTGRESQL_PASSWORD")\"" \ > "$PGBOUNCER_AUTH_FILE" echo "$PGBOUNCER_USERLIST" >> "$PGBOUNCER_AUTH_FILE" else