From 218e73ee15409789e5e75c901cfa1595b332f830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 20 Jan 2020 14:59:27 +0100 Subject: [PATCH] Add setting for DB sslmode --- config/config.go | 1 + db/db.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/config.go b/config/config.go index 3874f2ad..65131ca1 100644 --- a/config/config.go +++ b/config/config.go @@ -24,6 +24,7 @@ type DBConfig struct { User string `long:"db-user" env:"DB_USER" yaml:"user" description:"Database user." default:"gorm"` Password string `long:"db-password" env:"DB_PASSWORD" yaml:"password" description:"Database password."` Name string `long:"db-name" env:"DB_NAME" yaml:"name" description:"Database name." default:"gorm"` + SSLMode string `long:"db-sslmode" yaml:"sslmode" description:"Database SSL mode." default:"disable"` NoSync bool `long:"no-sync" yaml:"no-sync" description:"Do not sync database."` SyncInterval uint16 `long:"sync-interval" yaml:"sync-interval" description:"DB sync interval (in minutes)" default:"1"` } diff --git a/db/db.go b/db/db.go index 5c9f30a3..19150432 100644 --- a/db/db.go +++ b/db/db.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/camptocamp/terraboard/config" - "github.com/camptocamp/terraboard/types" "github.com/camptocamp/terraboard/state" + "github.com/camptocamp/terraboard/types" "github.com/hashicorp/terraform/states" "github.com/hashicorp/terraform/states/statefile" log "github.com/sirupsen/logrus" @@ -29,7 +29,7 @@ var pageSize = 20 // Init setups up the Database and a pointer to it func Init(config config.DBConfig, debug bool) *Database { var err error - connString := fmt.Sprintf("host=%s port=%d user=%s dbname=%s sslmode=disable password=%s", config.Host, config.Port, config.User, config.Name, config.Password) + connString := fmt.Sprintf("host=%s port=%d user=%s dbname=%s sslmode=%s password=%s", config.Host, config.Port, config.User, config.Name, config.SSLMode, config.Password) db, err := gorm.Open("postgres", connString) if err != nil { log.Fatal(err)