pgbouncer: add global query_timeout of 30s [todo:keep?]

.env

@@ -52,6 +52,7 @@ IPL_GTFS_DB_POSTGREST_PASSWORD=password
 PGBOUNCER_IMAGE=bitnami/pgbouncer:1
 PGBOUNCER_POSTGRES_PORT=6432
 PGBOUNCER_POSTGRES_USER=postgres
+PGBOUNCER_QUERY_TIMEOUT_SECONDS=30
 
 # gtfs-api variables
 IPL_GTFS_API_PORT=4000

docker-compose.yml

@@ -377,6 +377,8 @@ services:
       # contains the latest import's DB name
       - ./var/gtfs/pgbouncer-dsn.txt:/var/gtfs-pgbouncer-dsn.txt
       - ./etc/reload-pgbouncer-databases.sh:/reload-pgbouncer-databases.sh
+      # custom init scripts, configuring pgbouncer in addition to $PGBOUNCER_*
+      - ./etc/pgbouncer-init.d:/docker-entrypoint-initdb.d
     environment:
       # Even if we define all upstream database connections "manually" using $PGBOUNCER_DSN_* (see below), the bitnami/pgbouncer Docker image expects 1 connection to be specified via $POSTGRESQL_*, which it implicitly adds to the `[database]` section of pgbouncer.ini. Note that the specified database credentials must be valid.
       # However, the $POSTGRESQL_* env vars are *also* used to configure client access to pgbouncer: They get implicitly added to the generated userlist.txt, meaning that clients *must* use them (if there are no other user/password pairs defined, which we don't do) to connect to *any* exposed connection.
@@ -395,6 +397,8 @@ services:
       # Geoserver fails to connect without this config
       # see https://github.com/bitnami/containers/issues/25394#issuecomment-1457893192
       PGBOUNCER_IGNORE_STARTUP_PARAMETERS: extra_float_digits
+      # picked up by /docker-entrypoint-initdb.d/20-query_timeout.sh
+      PGBOUNCER_QUERY_TIMEOUT_SECONDS: ${PGBOUNCER_QUERY_TIMEOUT_SECONDS:?missing/empty $PGBOUNCER_QUERY_TIMEOUT_SECONDS}
 
       # upsteam connections
       # see also https://www.pgbouncer.org/config.html#section-databases

etc/pgbouncer-init.d/20-query_timeout.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+set -u
+set -x # todo: remove?
+
+ini-file set --ignore-inline-comments \
+	--section 'pgbouncer' \
+	--key 'query_timeout' \
+	--value "${PGBOUNCER_QUERY_TIMEOUT_SECONDS:?missing/empty env var $PGBOUNCER_QUERY_TIMEOUT_SECONDS}" \
+	"$PGBOUNCER_CONF_FILE"