Skip to content

Commit ee1e49a

Browse files
cbrogliebeertje44
authored andcommitted
[bitnami/pgbouncer] Add PGBOUNCER_AUTH_IDENT_FILE (bitnami#75939)
This adds support for user name maps via auth_ident_file. cf: pgbouncer/pgbouncer#996 Signed-off-by: Christopher Broglie <cbroglie@cloudflare.com>
1 parent 7b29f80 commit ee1e49a

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

bitnami/pgbouncer/1/debian-12/rootfs/opt/bitnami/scripts/libpgbouncer.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ pgbouncer_validate() {
7373
elif [[ ! -f "$PGBOUNCER_AUTH_HBA_FILE" ]]; then
7474
print_validation_error "The hba file in the specified path ${PGBOUNCER_AUTH_HBA_FILE} does not exist"
7575
fi
76+
if [[ ! -z "$PGBOUNCER_AUTH_IDENT_FILE" ]] && [[ ! -f "$PGBOUNCER_AUTH_IDENT_FILE" ]]; then
77+
print_validation_error "The ident map file in the specified path ${PGBOUNCER_AUTH_IDENT_FILE} does not exist"
78+
fi
7679
fi
7780

7881
# TLS Checks (client)
@@ -269,6 +272,7 @@ pgbouncer_initialize() {
269272
"auth_file:${PGBOUNCER_AUTH_FILE}"
270273
"auth_type:${PGBOUNCER_AUTH_TYPE}"
271274
"auth_hba_file:${PGBOUNCER_AUTH_HBA_FILE}"
275+
"auth_ident_file:${PGBOUNCER_AUTH_IDENT_FILE}"
272276
"auth_query:${PGBOUNCER_AUTH_QUERY}"
273277
"pidfile:${PGBOUNCER_PID_FILE}"
274278
"logfile:${PGBOUNCER_LOG_FILE}"

bitnami/pgbouncer/1/debian-12/rootfs/opt/bitnami/scripts/pgbouncer-env.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ pgbouncer_env_vars=(
3232
PGBOUNCER_AUTH_QUERY
3333
PGBOUNCER_AUTH_TYPE
3434
PGBOUNCER_AUTH_HBA_FILE
35+
PGBOUNCER_AUTH_IDENT_FILE
3536
PGBOUNCER_STATS_USERS
3637
PGBOUNCER_POOL_MODE
3738
PGBOUNCER_INIT_SLEEP_TIME
@@ -126,6 +127,7 @@ export PGBOUNCER_AUTH_USER="${PGBOUNCER_AUTH_USER:-}"
126127
export PGBOUNCER_AUTH_QUERY="${PGBOUNCER_AUTH_QUERY:-}"
127128
export PGBOUNCER_AUTH_TYPE="${PGBOUNCER_AUTH_TYPE:-scram-sha-256}"
128129
export PGBOUNCER_AUTH_HBA_FILE="${PGBOUNCER_AUTH_HBA_FILE:-}"
130+
export PGBOUNCER_AUTH_IDENT_FILE="${PGBOUNCER_AUTH_IDENT_FILE:-}"
129131
export PGBOUNCER_STATS_USERS="${PGBOUNCER_STATS_USERS:-}"
130132
export PGBOUNCER_POOL_MODE="${PGBOUNCER_POOL_MODE:-}"
131133
export PGBOUNCER_INIT_SLEEP_TIME="${PGBOUNCER_INIT_SLEEP_TIME:-10}"

bitnami/pgbouncer/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ docker build -t bitnami/APP:latest .
8282
| `PGBOUNCER_AUTH_QUERY` | PgBouncer authentication query | `nil` |
8383
| `PGBOUNCER_AUTH_TYPE` | PgBouncer authentication type | `scram-sha-256` |
8484
| `PGBOUNCER_AUTH_HBA_FILE` | HBA configuration file to use | `nil` |
85+
| `PGBOUNCER_AUTH_IDENT_FILE` | Ident map file to use | `nil` |
8586
| `PGBOUNCER_STATS_USERS` | PgBouncer comma-separated list of database users that are allowed to connect and run read-only queries. | `nil` |
8687
| `PGBOUNCER_POOL_MODE` | PgBouncer pool mode. Allowed values: session (default), transaction and statement. | `nil` |
8788
| `PGBOUNCER_INIT_SLEEP_TIME` | PgBouncer initialization sleep time | `10` |

0 commit comments

Comments
 (0)