Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add setting for DB sslmode #70

Merged
merged 1 commit into from
Jan 20, 2020
Merged

Add setting for DB sslmode #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}
Expand Down
4 changes: 2 additions & 2 deletions db/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)
Expand Down