ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-30 09:48:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

finish pgbouncer integration

Browse Source
This commit is contained in:
Grant Limberg 2018-12-03 16:12:15 -08:00
parent c8d5215870
commit 328d08781a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
controller/PostgreSQL.cpp
View File

@ -1333,6 +1333,7 @@ PGconn *PostgreSQL::getPgConn(OverrideMode m) {
if (m == ALLOW_PGBOUNCER_OVERRIDE) { if (m == ALLOW_PGBOUNCER_OVERRIDE) {
char *connStr = getenv("PGBOUNCER_CONNSTR"); char *connStr = getenv("PGBOUNCER_CONNSTR");
if (connStr != NULL) { if (connStr != NULL) {
fprintf(stderr, "PGBouncer Override\n");
return PQconnectdb(connStr); return PQconnectdb(connStr);
} }
} }

2
docker/main.sh
View File

@ -38,7 +38,7 @@ echo "{
\"inot\", \"inot\",
\"nat64\" \"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 " > /var/lib/zerotier-one/local.conf