From 328d08781a6998df63d51802b8985ce3561a1c3d Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Mon, 3 Dec 2018 16:12:15 -0800 Subject: [PATCH] finish pgbouncer integration --- controller/PostgreSQL.cpp | 1 + docker/main.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/controller/PostgreSQL.cpp b/controller/PostgreSQL.cpp index 5c9b15796..ff1d6c59a 100644 --- a/controller/PostgreSQL.cpp +++ b/controller/PostgreSQL.cpp @@ -1333,6 +1333,7 @@ PGconn *PostgreSQL::getPgConn(OverrideMode m) { if (m == ALLOW_PGBOUNCER_OVERRIDE) { char *connStr = getenv("PGBOUNCER_CONNSTR"); if (connStr != NULL) { + fprintf(stderr, "PGBouncer Override\n"); return PQconnectdb(connStr); } } diff --git a/docker/main.sh b/docker/main.sh index 19e503391..92b46b204 100644 --- a/docker/main.sh +++ b/docker/main.sh @@ -38,7 +38,7 @@ echo "{ \"inot\", \"nat64\" ], - \"controllerDbPath\": \"postgres:host=${ZT_DB_HOST} port=${ZT_DB_PORT} dbname=ztc user=${ZT_DB_USER} password=${ZT_DB_PASSWORD}\" + \"controllerDbPath\": \"postgres:host=${ZT_DB_HOST} port=${ZT_DB_PORT} dbname=ztc user=${ZT_DB_USER} password=${ZT_DB_PASSWORD} sslmode=require sslcert=${DB_CLIENT_CERT} sslkey=${DB_CLIENT_KEY} sslrootcert=${DB_SERVER_CA}\" } } " > /var/lib/zerotier-one/local.conf