gtsocial-umbx

commit 29bdc41baad96752fc18a1cf73e0a14f153b25d1
parent b1a4f38e383279d14d10b6b4575f752ca4b54f73
Author: Tobi Smethurst <31960611+tsmethurst@users.noreply.github.com>
Date:   Mon, 19 Jul 2021 19:31:47 +0200

Config bugfix (#104)

* fix some config bugs

* go fmt
Diffstat:
M
internal/config/config.go
 | 
2
+-
M
internal/db/pg/pg.go
 | 
1
+

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -98,7 +98,7 @@ func loadFromFile(path string) (*Config, error) {
 		return nil, fmt.Errorf("could not read file at path %s: %s", path, err)
 	}
 
-	config := &Config{}
+	config := Empty()
 	if err := yaml.Unmarshal(bytes, config); err != nil {
 		return nil, fmt.Errorf("could not unmarshal file at path %s: %s", path, err)
 	}
diff --git a/internal/db/pg/pg.go b/internal/db/pg/pg.go
@@ -148,6 +148,7 @@ func derivePGOptions(c *config.Config) (*pg.Options, error) {
 	case config.DBTLSModeRequire:
 		tlsConfig = &tls.Config{
 			InsecureSkipVerify: false,
+			ServerName:         c.DBConfig.Address,
 		}
 	}