ahmadk953/poixpixel-discord-bot
1
0
Fork 0
mirror of https://github.com/ahmadk953/poixpixel-discord-bot.git synced 2025-06-21 21:54:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

chore: small script and file fixes
Some checks are pending
Commitlint / Run commitlint scanning (push) Waiting to run
Details

Browse source
This commit is contained in:
ahmadk953 2025-06-17 20:24:57 -04:00
parent 9a4c794d51
commit 6865672d81
No known key found for this signature in database
GPG key ID: 31D488058614185C
9 changed files with 310 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/docker.yml vendored
View file

@ -50,7 +50,7 @@ jobs:
with: with:
context: docker/pgbouncer context: docker/pgbouncer
file: docker/pgbouncer/Dockerfile file: docker/pgbouncer/Dockerfile
push: true push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha,scope=pgbouncer cache-from: type=gha,scope=pgbouncer
@ -60,4 +60,4 @@ jobs:
env: env:
TAGS: ${{ steps.meta.outputs.tags }} TAGS: ${{ steps.meta.outputs.tags }}
DIGEST: ${{ steps.build-and-push.outputs.digest }} DIGEST: ${{ steps.build-and-push.outputs.digest }}
run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST} run: echo "${TAGS}" | xargs -I {} cosign sign --yes "{}@${DIGEST}"

10
.lintstagedrc.mjs
View file

@ -2,9 +2,13 @@ import path from 'path';
import process from 'process'; import process from 'process';
const buildEslintCommand = (filenames) => { const buildEslintCommand = (filenames) => {
// only lint files under src/ const srcDir = path.resolve(process.cwd(), 'src');
const srcFiles = filenames.filter((f) => f.startsWith('src/')); const srcFiles = filenames.filter((f) => {
if (srcFiles.length === 0) return ''; const absolute = path.resolve(process.cwd(), f);
const relativeToSrc = path.relative(srcDir, absolute);
return !relativeToSrc.startsWith('..');
});
if (srcFiles.length === 0) return [];
return `eslint ${srcFiles return `eslint ${srcFiles
.map((f) => path.relative(process.cwd(), f)) .map((f) => path.relative(process.cwd(), f))
.join(' ')}`; .join(' ')}`;

29
docker-compose.yml
View file

@ -17,7 +17,11 @@ services:
-c ssl_cert_file=/var/lib/postgresql/server.crt -c ssl_cert_file=/var/lib/postgresql/server.crt
-c ssl_key_file=/var/lib/postgresql/server.key -c ssl_key_file=/var/lib/postgresql/server.key
healthcheck: healthcheck:
test: ['CMD-SHELL', 'pg_isready -U ${POSTGRES_USER}'] test:
[
'CMD-SHELL',
'PGPASSWORD=${POSTGRES_PASSWORD} pg_isready -U ${POSTGRES_USER} -h localhost -p 5432 --db=${POSTGRES_DB}',
]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5
@ -44,7 +48,20 @@ services:
--tls-key-file /certs/server.key --tls-key-file /certs/server.key
--tls-ca-cert-file /certs/ca.crt --tls-ca-cert-file /certs/ca.crt
healthcheck: healthcheck:
test: ['CMD', 'valkey-cli', '-a', '${VALKEY_PASSWORD}', 'ping'] test: [
'CMD-SHELL',
'valkey-cli
-a
${VALKEY_PASSWORD}
--tls
--cacert
/certs/ca.crt
--cert
/certs/server.crt
--key
/certs/server.key
ping',
]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5
@ -58,7 +75,7 @@ services:
DB_USER: ${POSTGRES_USER} DB_USER: ${POSTGRES_USER}
DB_PASSWORD: ${POSTGRES_PASSWORD} DB_PASSWORD: ${POSTGRES_PASSWORD}
DB_HOST: postgres DB_HOST: postgres
# DB_NAME: ${POSTGRES_DB} AUTH_USER: ${POSTGRES_USER}
AUTH_TYPE: scram-sha-256 AUTH_TYPE: scram-sha-256
POOL_MODE: transaction POOL_MODE: transaction
ADMIN_USERS: ${POSTGRES_USER} ADMIN_USERS: ${POSTGRES_USER}
@ -76,7 +93,11 @@ services:
- ./certs/pgbouncer-server.key:/certs/server.key:ro - ./certs/pgbouncer-server.key:/certs/server.key:ro
- ./certs/pgbouncer-ca.crt:/certs/ca.crt:ro - ./certs/pgbouncer-ca.crt:/certs/ca.crt:ro
healthcheck: healthcheck:
test: ['CMD', 'pg_isready', '-h', 'localhost'] test:
[
'CMD-SHELL',
'PGPASSWORD=${POSTGRES_PASSWORD} pg_isready -U ${POSTGRES_USER} -h localhost -p 5432 --db=${POSTGRES_DB}',
]
networks: networks:
- services - services

31
docker/pgbouncer/Dockerfile
View file

@ -11,27 +11,24 @@ ARG C_ARES_VERSION=1.34.5
RUN apk add --no-cache autoconf autoconf-doc automake curl gcc git libc-dev libevent-dev libtool make openssl-dev pandoc pkgconfig RUN apk add --no-cache autoconf autoconf-doc automake curl gcc git libc-dev libevent-dev libtool make openssl-dev pandoc pkgconfig
RUN curl -Lo /c-ares.tar.gz https://github.com/c-ares/c-ares/releases/download/v${C_ARES_VERSION}/c-ares-${C_ARES_VERSION}.tar.gz && \ RUN set -eux; \
tar -xzf /c-ares.tar.gz && mv /c-ares-${C_ARES_VERSION} /c-ares curl -Lo /c-ares.tar.gz https://github.com/c-ares/c-ares/releases/download/v${C_ARES_VERSION}/c-ares-${C_ARES_VERSION}.tar.gz && \
tar -xzf /c-ares.tar.gz && mv /c-ares-${C_ARES_VERSION} /c-ares && \
RUN curl -Lo /pgbouncer.tar.gz https://pgbouncer.github.io/downloads/files/${PGBOUNCER_VERSION}/pgbouncer-${PGBOUNCER_VERSION}.tar.gz && \ cd /c-ares && ./configure && make && make install && \
tar -xzf /pgbouncer.tar.gz && mv /pgbouncer-${PGBOUNCER_VERSION} /pgbouncer curl -Lo /pgbouncer.tar.gz https://pgbouncer.github.io/downloads/files/${PGBOUNCER_VERSION}/pgbouncer-${PGBOUNCER_VERSION}.tar.gz && \
tar -xzf /pgbouncer.tar.gz -C / && mv /pgbouncer-${PGBOUNCER_VERSION} /pgbouncer && \
RUN cd /c-ares && ./configure && make && make install cd /pgbouncer && ./configure --with-cares && make && make install
RUN cd /pgbouncer && ./configure --with-cares && make && make install
FROM alpine:3.22 FROM alpine:3.22
COPY entrypoint.sh /entrypoint.sh RUN apk add --no-cache busybox libevent postgresql-client libssl3 \
&& mkdir -p /etc/pgbouncer /var/log/pgbouncer /var/run/pgbouncer \
RUN apk add --no-cache busybox libevent postgresql-client \ && touch /etc/pgbouncer/userlist.txt \
&& mkdir -p /etc/pgbouncer /var/log/pgbouncer /var/run/pgbouncer \ && addgroup -S -g 1100 pgbouncer \
&& touch /etc/pgbouncer/userlist.txt \ && adduser -S -u 1100 -G pgbouncer pgbouncer \
&& addgroup -S -g 1100 pgbouncer \ && chown -R pgbouncer:pgbouncer /etc/pgbouncer /var/log/pgbouncer /var/run/pgbouncer
&& adduser -S -u 1100 -G pgbouncer pgbouncer \
&& chown -R pgbouncer:pgbouncer /etc/pgbouncer /var/log/pgbouncer /var/run/pgbouncer /entrypoint.sh \
&& chmod +x /entrypoint.sh
COPY --chmod=+x entrypoint.sh /entrypoint.sh
COPY --from=build /usr/local/bin /usr/local/bin COPY --from=build /usr/local/bin /usr/local/bin
COPY --from=build /usr/local/lib /usr/local/lib COPY --from=build /usr/local/lib /usr/local/lib
COPY --from=build /pgbouncer/etc/pgbouncer.ini /etc/pgbouncer/pgbouncer.ini.example COPY --from=build /pgbouncer/etc/pgbouncer.ini /etc/pgbouncer/pgbouncer.ini.example

4
docker/pgbouncer/README.md
View file

@ -58,7 +58,7 @@ docker run --rm \
- **Dockerfile**: Modify build arguments or dependencies as needed. - **Dockerfile**: Modify build arguments or dependencies as needed.
- **entrypoint.sh**: Adjust how the configuration file is generated and updated. - **entrypoint.sh**: Adjust how the configuration file is generated and updated.
- **Environment Variables**: Almost all settings found in the `pgbouncer.ini` file can be set as environment variables with the exception of a few, system-specific configuration options. For an example, check out [the example Docker compose file](../../docker-compose.yml). For all configuration options, check the [pgbouncer configuration documentation](https://www.pgbouncer.org/config.html). - **Environment Variables**: Almost all settings found in the `pgbouncer.ini` file can be set as environment variables, except for a few system-specific configuration options. For an example, check out [the example Docker compose file](../../docker-compose.yml). For all configuration options, check the [pgbouncer configuration documentation](https://www.pgbouncer.org/config.html).
- **Configuration File**: You can specify your own `pgbouncer.ini` file by mounting it as a volume like so: - **Configuration File**: You can specify your own `pgbouncer.ini` file by mounting it as a volume like so:
```sh ```sh
docker run --rm \ docker run --rm \
@ -67,7 +67,7 @@ docker run --rm \
-e DB_HOST=postgres-host \ -e DB_HOST=postgres-host \
-e DB_NAME=database \ -e DB_NAME=database \
-v pgbouncer.ini:/etc/pgbouncer/pgbouncer.ini:ro \ -v pgbouncer.ini:/etc/pgbouncer/pgbouncer.ini:ro \
-p 5432:5432 -p 5432:5432 \
ghcr.io/ahmadk953/poixpixel-discord-bot-pgbouncer ghcr.io/ahmadk953/poixpixel-discord-bot-pgbouncer
``` ```

359
docker/pgbouncer/entrypoint.sh
View file

@ -22,7 +22,7 @@ fi
# Parameters: # Parameters:
# - The url we should parse # - The url we should parse
# Returns (sets variables): DB_USER, DB_PASSWORD, DB_HOST, DB_PORT, DB_NAME # Returns (sets variables): DB_USER, DB_PASSWORD, DB_HOST, DB_PORT, DB_NAME
function parse_url() { parse_url() {
# Thanks to https://stackoverflow.com/a/17287984/146289 # Thanks to https://stackoverflow.com/a/17287984/146289
# Allow to pass values like dj-database-url / django-environ accept # Allow to pass values like dj-database-url / django-environ accept
@ -39,10 +39,10 @@ function parse_url() {
fi fi
# extract the host -- updated # extract the host -- updated
hostport=`echo $url | sed -e s,$userpass@,,g | cut -d/ -f1` hostport=$(echo $url | sed -e s,$userpass@,,g | cut -d/ -f1)
port=`echo $hostport | grep : | cut -d: -f2` port=$(echo $hostport | grep : | cut -d: -f2)
if [ -n "$port" ]; then if [ -n "$port" ]; then
DB_HOST=`echo $hostport | grep : | cut -d: -f1` DB_HOST=$(echo $hostport | grep : | cut -d: -f1)
DB_PORT="${port}" DB_PORT="${port}"
else else
DB_HOST="${hostport}" DB_HOST="${hostport}"
@ -52,31 +52,42 @@ function parse_url() {
} }
# Grabs variables set by `parse_url` and adds them to the userlist if not already set in there. # Grabs variables set by `parse_url` and adds them to the userlist if not already set in there.
function generate_userlist_if_needed() { generate_userlist_if_needed() {
if [ -n "${DB_USER}" -a -n "${DB_PASSWORD}" -a -e "${_AUTH_FILE}" ] && ! grep -q "^\"${DB_USER}\"" "${_AUTH_FILE}"; then if [ -n "${DB_USER}" ] && [ -n "${DB_PASSWORD}" ] && [ -e "${_AUTH_FILE}" ] && ! grep -q "^\"${DB_USER}\"" "${_AUTH_FILE}"; then
if [ "${AUTH_TYPE}" == "plain" ] || [ "${AUTH_TYPE}" == "scram-sha-256" ]; then if [ "${AUTH_TYPE}" = "plain" ] || [ "${AUTH_TYPE}" = "scram-sha-256" ]; then
pass="${DB_PASSWORD}" pass="${DB_PASSWORD}"
else else
pass="md5$(echo -n "${DB_PASSWORD}${DB_USER}" | md5sum | cut -f 1 -d ' ')" pass="md5$(printf '%s' "${DB_PASSWORD}${DB_USER}" | md5sum | cut -f 1 -d ' ')"
fi fi
echo "\"${DB_USER}\" \"${pass}\"" >> "${_AUTH_FILE}" echo "\"${DB_USER}\" \"${pass}\"" >>"${_AUTH_FILE}"
echo "Wrote authentication credentials for '${DB_USER}' to ${_AUTH_FILE}" echo "Wrote authentication credentials for '${DB_USER}' to ${_AUTH_FILE}"
fi fi
} }
# Grabs variables set by `parse_url` and adds them to the PG config file as a database entry. # Grabs variables set by `parse_url` and adds them to the PG config file as a database entry.
function generate_config_db_entry() { generate_config_db_entry() {
printf "\ # Prepare values
${DB_NAME:-*} = host=${DB_HOST:?"Setup pgbouncer config error! You must set DB_HOST env"} \ dbname=${DB_NAME:-*}
port=${DB_PORT:-5432} auth_user=${DB_USER:-postgres} host=${DB_HOST:?"Setup pgbouncer config error! You must set DB_HOST env"}
${CLIENT_ENCODING:+client_encoding = ${CLIENT_ENCODING}\n}\ port=${DB_PORT:-5432}
" >> "${PG_CONFIG_FILE}" auth_user=${DB_USER:-postgres}
# Print main entry
printf '%s = host=%s port=%s auth_user=%s\n' \
"$dbname" "$host" "$port" "$auth_user" \
>>"$PG_CONFIG_FILE"
# Optional client_encoding
if [ -n "$CLIENT_ENCODING" ]; then
printf 'client_encoding = %s\n' "$CLIENT_ENCODING" \
>>"$PG_CONFIG_FILE"
fi
} }
# Write the password with MD5 encryption, to avoid printing it during startup. # Write the password with MD5 encryption, to avoid printing it during startup.
# Notice that `docker inspect` will show unencrypted env variables. # Notice that `docker inspect` will show unencrypted env variables.
if [ -n "${DATABASE_URLS}" ]; then if [ -n "${DATABASE_URLS}" ]; then
echo "${DATABASE_URLS}" | tr , '\n' | while read url; do echo "${DATABASE_URLS}" | tr ',' '\n' | while IFS= read -r url; do
parse_url "$url" parse_url "$url"
generate_userlist_if_needed generate_userlist_if_needed
done done
@ -87,19 +98,20 @@ else
generate_userlist_if_needed generate_userlist_if_needed
fi fi
if [ ! -f "${PG_CONFIG_FILE}" ]; then if [ ! -f "$PG_CONFIG_FILE" ]; then
echo "Creating pgbouncer config in ${PG_CONFIG_DIR}" echo "Creating pgbouncer config in ${PG_CONFIG_DIR}"
# Config file is in "ini" format. Section names are between "[" and "]". # Config file is in "ini" format. Section names are between "[" and "]".
# Lines starting with ";" or "#" are taken as comments and ignored. # Lines starting with ";" or "#" are taken as comments and ignored.
# The characters ";" and "#" are not recognized when they appear later in the line. # The characters ";" and "#" are not recognized when they appear later in the line.
printf "\ # write static header
################## Auto generated ################## printf '%s\n%s\n' \
[databases] '################## Auto generated ##################' \
" > "${PG_CONFIG_FILE}" '[databases]' \
>"$PG_CONFIG_FILE"
if [ -n "$DATABASE_URLS" ]; then if [ -n "$DATABASE_URLS" ]; then
echo "$DATABASE_URLS" | tr , '\n' | while read url; do echo "$DATABASE_URLS" | tr , '\n' | while read -r url; do
parse_url "$url" parse_url "$url"
generate_config_db_entry generate_config_db_entry
done done
@ -110,94 +122,231 @@ if [ ! -f "${PG_CONFIG_FILE}" ]; then
generate_config_db_entry generate_config_db_entry
fi fi
printf "\ # write [pgbouncer] section with a constant format string
[pgbouncer] {
listen_addr = ${LISTEN_ADDR:-0.0.0.0} printf '%s\n' '[pgbouncer]'
listen_port = ${LISTEN_PORT:-5432} printf 'listen_addr = %s\n' "${LISTEN_ADDR:-0.0.0.0}"
unix_socket_dir = ${UNIX_SOCKET_DIR} printf 'listen_port = %s\n' "${LISTEN_PORT:-5432}"
user = pgbouncer printf 'unix_socket_dir = %s\n' "${UNIX_SOCKET_DIR}"
auth_file = ${_AUTH_FILE} printf 'user = %s\n' "pgbouncer"
${AUTH_HBA_FILE:+auth_hba_file = ${AUTH_HBA_FILE}\n}\ printf 'auth_file = %s\n' "${_AUTH_FILE}"
auth_type = ${AUTH_TYPE:-md5} } >>"$PG_CONFIG_FILE"
${AUTH_USER:+auth_user = ${AUTH_USER}\n}\
${AUTH_QUERY:+auth_query = ${AUTH_QUERY}\n}\
${AUTH_DBNAME:+auth_dbname = ${AUTH_DBNAME}\n}\
${POOL_MODE:+pool_mode = ${POOL_MODE}\n}\
${MAX_CLIENT_CONN:+max_client_conn = ${MAX_CLIENT_CONN}\n}\
${POOL_SIZE:+pool_size = ${POOL_SIZE}\n}\
${DEFAULT_POOL_SIZE:+default_pool_size = ${DEFAULT_POOL_SIZE}\n}\
${MIN_POOL_SIZE:+min_pool_size = ${MIN_POOL_SIZE}\n}\
${RESERVE_POOL_SIZE:+reserve_pool_size = ${RESERVE_POOL_SIZE}\n}\
${RESERVE_POOL_TIMEOUT:+reserve_pool_timeout = ${RESERVE_POOL_TIMEOUT}\n}\
${MAX_DB_CONNECTIONS:+max_db_connections = ${MAX_DB_CONNECTIONS}\n}\
${MAX_USER_CONNECTIONS:+max_user_connections = ${MAX_USER_CONNECTIONS}\n}\
${SERVER_ROUND_ROBIN:+server_round_robin = ${SERVER_ROUND_ROBIN}\n}\
ignore_startup_parameters = ${IGNORE_STARTUP_PARAMETERS:-extra_float_digits}
${DISABLE_PQEXEC:+disable_pqexec = ${DISABLE_PQEXEC}\n}\
${APPLICATION_NAME_ADD_HOST:+application_name_add_host = ${APPLICATION_NAME_ADD_HOST}\n}\
${TIMEZONE:+timezone = ${TIMEZONE}\n}\
${MAX_PREPARED_STATEMENTS:+max_prepared_statements = ${MAX_PREPARED_STATEMENTS}\n}\
# Log settings # now handle each optional setting in its own if-block:
${LOG_CONNECTIONS:+log_connections = ${LOG_CONNECTIONS}\n}\ if [ -n "${AUTH_HBA_FILE}" ]; then
${LOG_DISCONNECTIONS:+log_disconnections = ${LOG_DISCONNECTIONS}\n}\ printf 'auth_hba_file = %s\n' "${AUTH_HBA_FILE}" >>"$PG_CONFIG_FILE"
${LOG_POOLER_ERRORS:+log_pooler_errors = ${LOG_POOLER_ERRORS}\n}\ fi
${LOG_STATS:+log_stats = ${LOG_STATS}\n}\ if [ -n "${AUTH_TYPE}" ]; then
${STATS_PERIOD:+stats_period = ${STATS_PERIOD}\n}\ printf 'auth_type = %s\n' "${AUTH_TYPE}" >>"$PG_CONFIG_FILE"
${VERBOSE:+verbose = ${VERBOSE}\n}\ fi
admin_users = ${ADMIN_USERS:-postgres} if [ -n "${AUTH_USER}" ]; then
${STATS_USERS:+stats_users = ${STATS_USERS}\n}\ printf 'auth_user = %s\n' "${AUTH_USER}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${AUTH_QUERY}" ]; then
printf 'auth_query = %s\n' "${AUTH_QUERY}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${AUTH_DBNAME}" ]; then
printf 'auth_dbname = %s\n' "${AUTH_DBNAME}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${POOL_MODE}" ]; then
printf 'pool_mode = %s\n' "${POOL_MODE}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${MAX_CLIENT_CONN}" ]; then
printf 'max_client_conn = %s\n' "${MAX_CLIENT_CONN}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${POOL_SIZE}" ]; then
printf 'pool_size = %s\n' "${POOL_SIZE}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${DEFAULT_POOL_SIZE}" ]; then
printf 'default_pool_size = %s\n' "${DEFAULT_POOL_SIZE}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${MIN_POOL_SIZE}" ]; then
printf 'min_pool_size = %s\n' "${MIN_POOL_SIZE}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${RESERVE_POOL_SIZE}" ]; then
printf 'reserve_pool_size = %s\n' "${RESERVE_POOL_SIZE}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${RESERVE_POOL_TIMEOUT}" ]; then
printf 'reserve_pool_timeout = %s\n' "${RESERVE_POOL_TIMEOUT}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${MAX_DB_CONNECTIONS}" ]; then
printf 'max_db_connections = %s\n' "${MAX_DB_CONNECTIONS}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${MAX_USER_CONNECTIONS}" ]; then
printf 'max_user_connections = %s\n' "${MAX_USER_CONNECTIONS}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${SERVER_ROUND_ROBIN}" ]; then
printf 'server_round_robin = %s\n' "${SERVER_ROUND_ROBIN}" >>"$PG_CONFIG_FILE"
fi
printf 'ignore_startup_parameters = %s\n' "${IGNORE_STARTUP_PARAMETERS:-extra_float_digits}" >>"$PG_CONFIG_FILE"
if [ -n "${DISABLE_PQEXEC}" ]; then
printf 'disable_pqexec = %s\n' "${DISABLE_PQEXEC}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${APPLICATION_NAME_ADD_HOST}" ]; then
printf 'application_name_add_host = %s\n' "${APPLICATION_NAME_ADD_HOST}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${TIMEZONE}" ]; then
printf 'timezone = %s\n' "${TIMEZONE}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${MAX_PREPARED_STATEMENTS}" ]; then
printf 'max_prepared_statements = %s\n' "${MAX_PREPARED_STATEMENTS}" >>"$PG_CONFIG_FILE"
fi
# Connection sanity checks, timeouts # Log settings
${SERVER_RESET_QUERY:+server_reset_query = ${SERVER_RESET_QUERY}\n}\ if [ -n "${LOG_CONNECTIONS}" ]; then
${SERVER_RESET_QUERY_ALWAYS:+server_reset_query_always = ${SERVER_RESET_QUERY_ALWAYS}\n}\ printf 'log_connections = %s\n' "${LOG_CONNECTIONS}" >>"$PG_CONFIG_FILE"
${SERVER_CHECK_DELAY:+server_check_delay = ${SERVER_CHECK_DELAY}\n}\ fi
${SERVER_CHECK_QUERY:+server_check_query = ${SERVER_CHECK_QUERY}\n}\ if [ -n "${LOG_DISCONNECTIONS}" ]; then
${SERVER_LIFETIME:+server_lifetime = ${SERVER_LIFETIME}\n}\ printf 'log_disconnections = %s\n' "${LOG_DISCONNECTIONS}" >>"$PG_CONFIG_FILE"
${SERVER_IDLE_TIMEOUT:+server_idle_timeout = ${SERVER_IDLE_TIMEOUT}\n}\ fi
${SERVER_CONNECT_TIMEOUT:+server_connect_timeout = ${SERVER_CONNECT_TIMEOUT}\n}\ if [ -n "${LOG_POOLER_ERRORS}" ]; then
${SERVER_LOGIN_RETRY:+server_login_retry = ${SERVER_LOGIN_RETRY}\n}\ printf 'log_pooler_errors = %s\n' "${LOG_POOLER_ERRORS}" >>"$PG_CONFIG_FILE"
${CLIENT_LOGIN_TIMEOUT:+client_login_timeout = ${CLIENT_LOGIN_TIMEOUT}\n}\ fi
${AUTODB_IDLE_TIMEOUT:+autodb_idle_timeout = ${AUTODB_IDLE_TIMEOUT}\n}\ if [ -n "${LOG_STATS}" ]; then
${DNS_MAX_TTL:+dns_max_ttl = ${DNS_MAX_TTL}\n}\ printf 'log_stats = %s\n' "${LOG_STATS}" >>"$PG_CONFIG_FILE"
${DNS_NXDOMAIN_TTL:+dns_nxdomain_ttl = ${DNS_NXDOMAIN_TTL}\n}\ fi
if [ -n "${STATS_PERIOD}" ]; then
printf 'stats_period = %s\n' "${STATS_PERIOD}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${VERBOSE}" ]; then
printf 'verbose = %s\n' "${VERBOSE}" >>"$PG_CONFIG_FILE"
fi
printf 'admin_users = %s\n' "${ADMIN_USERS:-postgres}" >>"$PG_CONFIG_FILE"
if [ -n "${STATS_USERS}" ]; then
printf 'stats_users = %s\n' "${STATS_USERS}" >>"$PG_CONFIG_FILE"
fi
# TLS settings # Connection sanity checks, timeouts
${CLIENT_TLS_SSLMODE:+client_tls_sslmode = ${CLIENT_TLS_SSLMODE}\n}\ if [ -n "${SERVER_RESET_QUERY}" ]; then
${CLIENT_TLS_KEY_FILE:+client_tls_key_file = ${CLIENT_TLS_KEY_FILE}\n}\ printf 'server_reset_query = %s\n' "${SERVER_RESET_QUERY}" >>"$PG_CONFIG_FILE"
${CLIENT_TLS_CERT_FILE:+client_tls_cert_file = ${CLIENT_TLS_CERT_FILE}\n}\ fi
${CLIENT_TLS_CA_FILE:+client_tls_ca_file = ${CLIENT_TLS_CA_FILE}\n}\ if [ -n "${SERVER_RESET_QUERY_ALWAYS}" ]; then
${CLIENT_TLS_PROTOCOLS:+client_tls_protocols = ${CLIENT_TLS_PROTOCOLS}\n}\ printf 'server_reset_query_always = %s\n' "${SERVER_RESET_QUERY_ALWAYS}" >>"$PG_CONFIG_FILE"
${CLIENT_TLS_CIPHERS:+client_tls_ciphers = ${CLIENT_TLS_CIPHERS}\n}\ fi
${CLIENT_TLS_ECDHCURVE:+client_tls_ecdhcurve = ${CLIENT_TLS_ECDHCURVE}\n}\ if [ -n "${SERVER_CHECK_DELAY}" ]; then
${CLIENT_TLS_DHEPARAMS:+client_tls_dheparams = ${CLIENT_TLS_DHEPARAMS}\n}\ printf 'server_check_delay = %s\n' "${SERVER_CHECK_DELAY}" >>"$PG_CONFIG_FILE"
${SERVER_TLS_SSLMODE:+server_tls_sslmode = ${SERVER_TLS_SSLMODE}\n}\ fi
${SERVER_TLS_CA_FILE:+server_tls_ca_file = ${SERVER_TLS_CA_FILE}\n}\ if [ -n "${SERVER_CHECK_QUERY}" ]; then
${SERVER_TLS_KEY_FILE:+server_tls_key_file = ${SERVER_TLS_KEY_FILE}\n}\ printf 'server_check_query = %s\n' "${SERVER_CHECK_QUERY}" >>"$PG_CONFIG_FILE"
${SERVER_TLS_CERT_FILE:+server_tls_cert_file = ${SERVER_TLS_CERT_FILE}\n}\ fi
${SERVER_TLS_PROTOCOLS:+server_tls_protocols = ${SERVER_TLS_PROTOCOLS}\n}\ if [ -n "${SERVER_LIFETIME}" ]; then
${SERVER_TLS_CIPHERS:+server_tls_ciphers = ${SERVER_TLS_CIPHERS}\n}\ printf 'server_lifetime = %s\n' "${SERVER_LIFETIME}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${SERVER_IDLE_TIMEOUT}" ]; then
printf 'server_idle_timeout = %s\n' "${SERVER_IDLE_TIMEOUT}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${SERVER_CONNECT_TIMEOUT}" ]; then
printf 'server_connect_timeout = %s\n' "${SERVER_CONNECT_TIMEOUT}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${SERVER_LOGIN_RETRY}" ]; then
printf 'server_login_retry = %s\n' "${SERVER_LOGIN_RETRY}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${CLIENT_LOGIN_TIMEOUT}" ]; then
printf 'client_login_timeout = %s\n' "${CLIENT_LOGIN_TIMEOUT}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${AUTODB_IDLE_TIMEOUT}" ]; then
printf 'autodb_idle_timeout = %s\n' "${AUTODB_IDLE_TIMEOUT}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${DNS_MAX_TTL}" ]; then
printf 'dns_max_ttl = %s\n' "${DNS_MAX_TTL}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${DNS_NXDOMAIN_TTL}" ]; then
printf 'dns_nxdomain_ttl = %s\n' "${DNS_NXDOMAIN_TTL}" >>"$PG_CONFIG_FILE"
fi
# Dangerous timeouts # TLS settings
${QUERY_TIMEOUT:+query_timeout = ${QUERY_TIMEOUT}\n}\ if [ -n "${CLIENT_TLS_SSLMODE}" ]; then
${QUERY_WAIT_TIMEOUT:+query_wait_timeout = ${QUERY_WAIT_TIMEOUT}\n}\ printf 'client_tls_sslmode = %s\n' "${CLIENT_TLS_SSLMODE}" >>"$PG_CONFIG_FILE"
${CLIENT_IDLE_TIMEOUT:+client_idle_timeout = ${CLIENT_IDLE_TIMEOUT}\n}\ fi
${IDLE_TRANSACTION_TIMEOUT:+idle_transaction_timeout = ${IDLE_TRANSACTION_TIMEOUT}\n}\ if [ -n "${CLIENT_TLS_KEY_FILE}" ]; then
${PKT_BUF:+pkt_buf = ${PKT_BUF}\n}\ printf 'client_tls_key_file = %s\n' "${CLIENT_TLS_KEY_FILE}" >>"$PG_CONFIG_FILE"
${MAX_PACKET_SIZE:+max_packet_size = ${MAX_PACKET_SIZE}\n}\ fi
${LISTEN_BACKLOG:+listen_backlog = ${LISTEN_BACKLOG}\n}\ if [ -n "${CLIENT_TLS_CERT_FILE}" ]; then
${SBUF_LOOPCNT:+sbuf_loopcnt = ${SBUF_LOOPCNT}\n}\ printf 'client_tls_cert_file = %s\n' "${CLIENT_TLS_CERT_FILE}" >>"$PG_CONFIG_FILE"
${SUSPEND_TIMEOUT:+suspend_timeout = ${SUSPEND_TIMEOUT}\n}\ fi
${TCP_DEFER_ACCEPT:+tcp_defer_accept = ${TCP_DEFER_ACCEPT}\n}\ if [ -n "${CLIENT_TLS_CA_FILE}" ]; then
${TCP_KEEPALIVE:+tcp_keepalive = ${TCP_KEEPALIVE}\n}\ printf 'client_tls_ca_file = %s\n' "${CLIENT_TLS_CA_FILE}" >>"$PG_CONFIG_FILE"
${TCP_KEEPCNT:+tcp_keepcnt = ${TCP_KEEPCNT}\n}\ fi
${TCP_KEEPIDLE:+tcp_keepidle = ${TCP_KEEPIDLE}\n}\ if [ -n "${CLIENT_TLS_PROTOCOLS}" ]; then
${TCP_KEEPINTVL:+tcp_keepintvl = ${TCP_KEEPINTVL}\n}\ printf 'client_tls_protocols = %s\n' "${CLIENT_TLS_PROTOCOLS}" >>"$PG_CONFIG_FILE"
${TCP_USER_TIMEOUT:+tcp_user_timeout = ${TCP_USER_TIMEOUT}\n}\ fi
################## end file ################## if [ -n "${CLIENT_TLS_CIPHERS}" ]; then
" >> "${PG_CONFIG_FILE}" printf 'client_tls_ciphers = %s\n' "${CLIENT_TLS_CIPHERS}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${CLIENT_TLS_ECDHCURVE}" ]; then
printf 'client_tls_ecdhcurve = %s\n' "${CLIENT_TLS_ECDHCURVE}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${CLIENT_TLS_DHEPARAMS}" ]; then
printf 'client_tls_dheparams = %s\n' "${CLIENT_TLS_DHEPARAMS}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${SERVER_TLS_SSLMODE}" ]; then
printf 'server_tls_sslmode = %s\n' "${SERVER_TLS_SSLMODE}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${SERVER_TLS_CA_FILE}" ]; then
printf 'server_tls_ca_file = %s\n' "${SERVER_TLS_CA_FILE}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${SERVER_TLS_KEY_FILE}" ]; then
printf 'server_tls_key_file = %s\n' "${SERVER_TLS_KEY_FILE}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${SERVER_TLS_CERT_FILE}" ]; then
printf 'server_tls_cert_file = %s\n' "${SERVER_TLS_CERT_FILE}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${SERVER_TLS_PROTOCOLS}" ]; then
printf 'server_tls_protocols = %s\n' "${SERVER_TLS_PROTOCOLS}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${SERVER_TLS_CIPHERS}" ]; then
printf 'server_tls_ciphers = %s\n' "${SERVER_TLS_CIPHERS}" >>"$PG_CONFIG_FILE"
fi
# Dangerous timeouts
if [ -n "${QUERY_TIMEOUT}" ]; then
printf 'query_timeout = %s\n' "${QUERY_TIMEOUT}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${QUERY_WAIT_TIMEOUT}" ]; then
printf 'query_wait_timeout = %s\n' "${QUERY_WAIT_TIMEOUT}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${CLIENT_IDLE_TIMEOUT}" ]; then
printf 'client_idle_timeout = %s\n' "${CLIENT_IDLE_TIMEOUT}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${IDLE_TRANSACTION_TIMEOUT}" ]; then
printf 'idle_transaction_timeout = %s\n' "${IDLE_TRANSACTION_TIMEOUT}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${PKT_BUF}" ]; then
printf 'pkt_buf = %s\n' "${PKT_BUF}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${MAX_PACKET_SIZE}" ]; then
printf 'max_packet_size = %s\n' "${MAX_PACKET_SIZE}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${LISTEN_BACKLOG}" ]; then
printf 'listen_backlog = %s\n' "${LISTEN_BACKLOG}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${SBUF_LOOPCNT}" ]; then
printf 'sbuf_loopcnt = %s\n' "${SBUF_LOOPCNT}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${SUSPEND_TIMEOUT}" ]; then
printf 'suspend_timeout = %s\n' "${SUSPEND_TIMEOUT}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${TCP_DEFER_ACCEPT}" ]; then
printf 'tcp_defer_accept = %s\n' "${TCP_DEFER_ACCEPT}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${TCP_KEEPALIVE}" ]; then
printf 'tcp_keepalive = %s\n' "${TCP_KEEPALIVE}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${TCP_KEEPCNT}" ]; then
printf 'tcp_keepcnt = %s\n' "${TCP_KEEPCNT}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${TCP_KEEPIDLE}" ]; then
printf 'tcp_keepidle = %s\n' "${TCP_KEEPIDLE}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${TCP_KEEPINTVL}" ]; then
printf 'tcp_keepintvl = %s\n' "${TCP_KEEPINTVL}" >>"$PG_CONFIG_FILE"
fi
if [ -n "${TCP_USER_TIMEOUT}" ]; then
printf 'tcp_user_timeout = %s\n' "${TCP_USER_TIMEOUT}" >>"$PG_CONFIG_FILE"
fi
printf '\n################## end file ##################\n' >>"$PG_CONFIG_FILE"
cat "${PG_CONFIG_FILE}" cat "${PG_CONFIG_FILE}"
fi fi
echo "Starting $*..." echo "Starting $*..."
exec "$@" exec "$@"

2
drizzle.config.ts
View file

@ -1,5 +1,3 @@
/* eslint-disable */
import fs from 'node:fs'; import fs from 'node:fs';
import path from 'node:path'; import path from 'node:path';
import { defineConfig } from 'drizzle-kit'; import { defineConfig } from 'drizzle-kit';

8
generate-certs.sh
View file

@ -45,9 +45,9 @@ sudo cp certs/pgbouncer-server.key certs/pgbouncer-client.key
sudo cp certs/cache-server.key certs/cache-client.key sudo cp certs/cache-server.key certs/cache-client.key
# Change Client Key Ownership # Change Client Key Ownership
sudo chown $_uid:$_gid certs/pgbouncer-client.key sudo chown "${_uid}:${_gid}" certs/pgbouncer-client.key
sudo chown $_uid:$_gid certs/cache-client.key sudo chown "${_uid}:${_gid}" certs/cache-client.key
# Change Client Key Permissions # Change Client Key Permissions
sudo chmod +r certs/pgbouncer-client.key sudo chmod 0600 certs/pgbouncer-client.key
sudo chmod +r certs/cache-client.key sudo chmod 0600 certs/cache-client.key

4
src/util/helpers.ts
View file

@ -19,7 +19,7 @@ import { moderationTable } from '@/db/schema.js';
import { db, getMember, handleDbError, updateMember } from '@/db/db.js'; import { db, getMember, handleDbError, updateMember } from '@/db/db.js';
import logAction from './logging/logAction.js'; import logAction from './logging/logAction.js';
const __dirname = path.resolve(); const PROJECT_ROOT = path.resolve();
/** /**
* Turns a duration string into milliseconds * Turns a duration string into milliseconds
@ -68,7 +68,7 @@ export async function generateMemberBanner({
height, height,
}: generateMemberBannerTypes): Promise<AttachmentBuilder> { }: generateMemberBannerTypes): Promise<AttachmentBuilder> {
const welcomeBackground = path.join( const welcomeBackground = path.join(
__dirname, PROJECT_ROOT,
'assets', 'assets',
'images', 'images',
'welcome-bg.png', 'welcome-bg.png',