From c76a6b6118e162e515267e89ad7528b5a5f0af44 Mon Sep 17 00:00:00 2001 From: arkadiuszos4chain Date: Wed, 31 Jan 2024 12:42:30 +0100 Subject: [PATCH 1/2] chore: bump bux ver 0.14.1 -> 0.14.2 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7832d0151..7d74deaf5 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/BuxOrg/bux-server go 1.21.5 require ( - github.com/BuxOrg/bux v0.14.1 + github.com/BuxOrg/bux v0.14.2 github.com/BuxOrg/bux-models v0.3.0 github.com/bitcoin-sv/go-broadcast-client v0.16.1 github.com/go-ozzo/ozzo-validation v3.6.0+incompatible diff --git a/go.sum b/go.sum index 64a4e84f0..6c49f7f3f 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/99designs/gqlgen v0.17.43 h1:I4SYg6ahjowErAQcHFVKy5EcWuwJ3+Xw9z2fLpuFCPo= github.com/99designs/gqlgen v0.17.43/go.mod h1:lO0Zjy8MkZgBdv4T1U91x09r0e0WFOdhVUutlQs1Rsc= -github.com/BuxOrg/bux v0.14.1 h1:J83uOlqe6ZowjSCnCa1sKig4YtN5JGcoJd54h6A2Kf8= -github.com/BuxOrg/bux v0.14.1/go.mod h1:Bdf2Nld2yrtvj9OTPr+bdhyv+lXEmTxldH03IPRGZIo= +github.com/BuxOrg/bux v0.14.2 h1:Ct4UKIGuAwdpdgRWfONpkSgA2Ik08imPTwM/9gSfLoQ= +github.com/BuxOrg/bux v0.14.2/go.mod h1:4Ku9S/zi4J9Gz1FNy7qJD6zNYcEmbbrx4MgrjSWlvAY= github.com/BuxOrg/bux-models v0.3.0 h1:+pvpDdYaiIgeOhAO847RK07Vzc+vuUvy2ok/xJevQyg= github.com/BuxOrg/bux-models v0.3.0/go.mod h1:JCpoXxVnKZmCy3rg6nOtLQL5AXh6iEo2tBvcD/qAxEY= github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= From 1dd7243d8ea496648f8a9467225d4a4b3a875e25 Mon Sep 17 00:00:00 2001 From: arkadiuszos4chain Date: Wed, 31 Jan 2024 12:51:21 +0100 Subject: [PATCH 2/2] chore: set default sslmode= disable --- config/defaults.go | 1 + config/services.go | 1 + 2 files changed, 2 insertions(+) diff --git a/config/defaults.go b/config/defaults.go index a6d6137da..0474d9db9 100644 --- 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 index 55d3ce2bd..e28a8ee2e 100644 --- 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 {