Skip to content

Commit

Permalink
feat: add config to enable/disable postgres ssl mode
Browse files Browse the repository at this point in the history
  • Loading branch information
vividvilla committed May 27, 2019
1 parent 08b9d15 commit 0911742
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion config.toml.sample
Expand Up @@ -35,7 +35,7 @@ upload_uri = "/uploads"
# Maximum concurrent workers that will attempt to send messages
# simultaneously. This should depend on the number of CPUs the
# machine has and also the number of simultaenous e-mails the
# mail server will
# mail server will
concurrency = 100

# The number of errors (eg: SMTP timeouts while e-mailing) a running
Expand All @@ -51,6 +51,7 @@ port = 5432
user = "listmonk"
password = ""
database = "listmonk"
ssl_mode = "disable"

# TQekh4quVgGc3HQ

Expand Down
3 changes: 2 additions & 1 deletion main.go
Expand Up @@ -148,7 +148,8 @@ func main() {
viper.GetInt("db.port"),
viper.GetString("db.user"),
viper.GetString("db.password"),
viper.GetString("db.database"))
viper.GetString("db.database"),
viper.GetString("db.ssl_mode"))
if err != nil {
logger.Fatalf("error connecting to DB: %v", err)
}
Expand Down
4 changes: 2 additions & 2 deletions queries.go
Expand Up @@ -79,9 +79,9 @@ type Queries struct {
}

// connectDB initializes a database connection.
func connectDB(host string, port int, user, pwd, dbName string) (*sqlx.DB, error) {
func connectDB(host string, port int, user, pwd, dbName string, sslMode string) (*sqlx.DB, error) {
db, err := sqlx.Connect("postgres",
fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s", host, port, user, pwd, dbName))
fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=%s", host, port, user, pwd, dbName, sslMode))
if err != nil {
return nil, err
}
Expand Down

0 comments on commit 0911742

Please sign in to comment.