Bladeren bron

finish pgbouncer integration

Grant Limberg 6 jaren geleden
bovenliggende
commit
328d08781a
2 gewijzigde bestanden met toevoegingen van 2 en 1 verwijderingen
  1. 1 0
      controller/PostgreSQL.cpp
  2. 1 1
      docker/main.sh

+ 1 - 0
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);
 		}
 	}

+ 1 - 1
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