diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2018-12-03 16:12:15 -0800 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2018-12-03 16:12:15 -0800 |
| commit | 328d08781a6998df63d51802b8985ce3561a1c3d (patch) | |
| tree | 3d98a62c09b944c985b96c9ed96302733a02f68a | |
| parent | c8d5215870a6361a080b3fcf82f7a1707ae20bb5 (diff) | |
| download | infinitytier-328d08781a6998df63d51802b8985ce3561a1c3d.tar.gz infinitytier-328d08781a6998df63d51802b8985ce3561a1c3d.zip | |
finish pgbouncer integration
| -rw-r--r-- | controller/PostgreSQL.cpp | 1 | ||||
| -rw-r--r-- | docker/main.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/controller/PostgreSQL.cpp b/controller/PostgreSQL.cpp index 5c9b1579..ff1d6c59 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 19e50339..92b46b20 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 |