mirror of
				https://github.com/juanfont/headscale.git
				synced 2025-10-30 23:51:03 +01:00 
			
		
		
		
	Change DBssl to string
This commit is contained in:
		
							parent
							
								
									99e33181b2
								
							
						
					
					
						commit
						72b9803a08
					
				
							
								
								
									
										7
									
								
								app.go
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								app.go
									
									
									
									
									
								
							| @ -11,6 +11,7 @@ import ( | ||||
| 	"os" | ||||
| 	"os/signal" | ||||
| 	"sort" | ||||
| 	"strconv" | ||||
| 	"strings" | ||||
| 	"sync" | ||||
| 	"syscall" | ||||
| @ -127,9 +128,13 @@ func NewHeadscale(cfg *Config) (*Headscale, error) { | ||||
| 			cfg.DBuser, | ||||
| 		) | ||||
| 
 | ||||
| 		if !cfg.DBssl { | ||||
| 		if s, err := strconv.ParseBool(cfg.DBssl); err == nil { | ||||
| 			if !s { | ||||
| 				dbString += " sslmode=disable" | ||||
| 			} | ||||
| 		} else { | ||||
| 			dbString += fmt.Sprintf(" sslmode=%s", cfg.DBssl) | ||||
| 		} | ||||
| 
 | ||||
| 		if cfg.DBport != 0 { | ||||
| 			dbString += fmt.Sprintf(" port=%d", cfg.DBport) | ||||
|  | ||||
| @ -51,7 +51,7 @@ type Config struct { | ||||
| 	DBname string | ||||
| 	DBuser string | ||||
| 	DBpass string | ||||
| 	DBssl  bool | ||||
| 	DBssl  string | ||||
| 
 | ||||
| 	TLS TLSConfig | ||||
| 
 | ||||
| @ -545,7 +545,7 @@ func GetHeadscaleConfig() (*Config, error) { | ||||
| 		DBname: viper.GetString("db_name"), | ||||
| 		DBuser: viper.GetString("db_user"), | ||||
| 		DBpass: viper.GetString("db_pass"), | ||||
| 		DBssl:  viper.GetBool("db_ssl"), | ||||
| 		DBssl:  viper.GetString("db_ssl"), | ||||
| 
 | ||||
| 		TLS: GetTLSConfig(), | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user