beenull/listmonk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: add config to enable/disable postgres ssl mode

Browse source
This commit is contained in:
Vivek R 2019-05-27 17:16:46 +05:30
parent 08b9d153da
commit 09117426ee
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config.toml.sample
View file

@ -35,7 +35,7 @@ upload_uri = "/uploads"
# Maximum concurrent workers that will attempt to send messages # Maximum concurrent workers that will attempt to send messages
# simultaneously. This should depend on the number of CPUs the # simultaneously. This should depend on the number of CPUs the
# machine has and also the number of simultaenous e-mails the # machine has and also the number of simultaenous e-mails the
# mail server will # mail server will
concurrency = 100 concurrency = 100
# The number of errors (eg: SMTP timeouts while e-mailing) a running # The number of errors (eg: SMTP timeouts while e-mailing) a running
@ -51,6 +51,7 @@ port = 5432
user = "listmonk" user = "listmonk"
password = "" password = ""
database = "listmonk" database = "listmonk"
ssl_mode = "disable"
# TQekh4quVgGc3HQ # TQekh4quVgGc3HQ

3
main.go
View file

@ -148,7 +148,8 @@ func main() {
viper.GetInt("db.port"), viper.GetInt("db.port"),
viper.GetString("db.user"), viper.GetString("db.user"),
viper.GetString("db.password"), viper.GetString("db.password"),
viper.GetString("db.database")) viper.GetString("db.database"),
viper.GetString("db.ssl_mode"))
if err != nil { if err != nil {
logger.Fatalf("error connecting to DB: %v", err) logger.Fatalf("error connecting to DB: %v", err)
} }

4
queries.go
View file

@ -79,9 +79,9 @@ type Queries struct {
} }
// connectDB initializes a database connection. // 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", 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 { if err != nil {
return nil, err return nil, err
} }