From f911070f68a433c2b7b3290e54c7cf45dc45ecec Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Sat, 3 Feb 2018 11:20:42 -0600 Subject: [PATCH] Add new SSL config to envvar parsing --- conn.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/conn.go b/conn.go index 9509973b..9ba1e87c 100644 --- a/conn.go +++ b/conn.go @@ -827,6 +827,9 @@ func ParseConnectionString(s string) (ConnConfig, error) { // PGUSER // PGPASSWORD // PGSSLMODE +// PGSSLCERT +// PGSSLKEY +// PGSSLROOTCERT // PGAPPNAME // PGCONNECT_TIMEOUT // @@ -874,9 +877,14 @@ func ParseEnvLibpq() (ConnConfig, error) { } } - sslmode := os.Getenv("PGSSLMODE") + tlsArgs := configTLSArgs{ + sslMode: os.Getenv("PGSSLMODE"), + sslKey: os.Getenv("PGSSLKEY"), + sslCert: os.Getenv("PGSSLCERT"), + sslRootCert: os.Getenv("PGSSLROOTCERT"), + } - err := configTLS(configTLSArgs{sslMode: sslmode}, &cc) + err := configTLS(tlsArgs, &cc) if err != nil { return cc, err }