devproje/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-30 02:43:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Change DBssl to string

Browse source
This commit is contained in:
Orville Q. Song 2022-11-04 01:11:22 +08:00 committed by Kristoffer Dalby
parent 99e33181b2
commit 72b9803a08
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app.go
View file

@ -11,6 +11,7 @@ import (
"os" "os"
"os/signal" "os/signal"
"sort" "sort"
"strconv"
"strings" "strings"
"sync" "sync"
"syscall" "syscall"
@ -127,9 +128,13 @@ func NewHeadscale(cfg *Config) (*Headscale, error) {
cfg.DBuser, cfg.DBuser,
) )
if !cfg.DBssl { if s, err := strconv.ParseBool(cfg.DBssl); err == nil {
if !s {
dbString += " sslmode=disable" dbString += " sslmode=disable"
} }
} else {
dbString += fmt.Sprintf(" sslmode=%s", cfg.DBssl)
}
if cfg.DBport != 0 { if cfg.DBport != 0 {
dbString += fmt.Sprintf(" port=%d", cfg.DBport) dbString += fmt.Sprintf(" port=%d", cfg.DBport)

4
config.go
View file

@ -51,7 +51,7 @@ type Config struct {
DBname string DBname string
DBuser string DBuser string
DBpass string DBpass string
DBssl bool DBssl string
TLS TLSConfig TLS TLSConfig
@ -545,7 +545,7 @@ func GetHeadscaleConfig() (*Config, error) {
DBname: viper.GetString("db_name"), DBname: viper.GetString("db_name"),
DBuser: viper.GetString("db_user"), DBuser: viper.GetString("db_user"),
DBpass: viper.GetString("db_pass"), DBpass: viper.GetString("db_pass"),
DBssl: viper.GetBool("db_ssl"), DBssl: viper.GetString("db_ssl"),
TLS: GetTLSConfig(), TLS: GetTLSConfig(),