Merge branch 'master' into feat/BUX-490/AdminGetPaymails

bitcoin-sv · Feb 1, 2024 · 9e8c6d5 · 9e8c6d5
2 parents 8926d64 + 9838f7a
commit 9e8c6d5
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 56 deletions.
diff --git a/config/defaults.go b/config/defaults.go
@@ -80,6 +80,7 @@ func getDbDefaults() *DbConfig {
 			TimeZone:                  "UTC",
 			TxTimeout:                 10 * time.Second,
 			User:                      "postgres",
+			SslMode:                   "disable",
 		},
 		SQLite: &datastore.SQLiteConfig{
 			DatabasePath:       "./bux.db",

diff --git a/config/services.go b/config/services.go
@@ -332,6 +332,7 @@ func loadDatastore(options []bux.ClientOps, appConfig *AppConfig, testMode bool)
 			TimeZone:  appConfig.Db.SQL.TimeZone,
 			TxTimeout: appConfig.Db.SQL.TxTimeout,
 			User:      appConfig.Db.SQL.User,
+			SslMode:   appConfig.Db.SQL.SslMode,
 		}))
 
 	} else if appConfig.Db.Datastore.Engine == datastore.MongoDB {

diff --git a/go.mod b/go.mod