yan/archived-teslamateapi
1
0
Fork 0
mirror of https://github.com/tobiasehlert/teslamateapi.git synced 2026-02-27 09:54:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Postgres SSL connection (#348)

Browse Source 
Co-authored-by: Tobias Lindberg <tobias.ehlert@gmail.com>
This commit is contained in:
Bryan Jones
2025-09-10 04:05:49 -04:00
committed by GitHub
parent 615f87b477
commit 76b124e1cb
2 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
README.md
View File

@@ -104,25 +104,26 @@ Basically the same environment variables for the database, mqqt and timezone nee
**Optional** environment variables
| Variable | Type | Default |
| --------------------- | ------- | ----------------------------- |
| **TESLAMATE_SSL** | boolean | _false_ |
| **TESLAMATE_HOST** | string | _teslamate_ |
| **TESLAMATE_PORT** | string | _4000_ |
| **API_TOKEN** | string | |
| **API_TOKEN_DISABLE** | string | _false_ |
| **DATABASE_PORT** | integer | _5432_ |
| **DATABASE_TIMEOUT** | integer | _60000_ |
| **DATABASE_SSL** | boolean | _true_ |
| **DEBUG_MODE** | boolean | _false_ |
| **DISABLE_MQTT** | boolean | _false_ |
| **MQTT_TLS** | boolean | _false_ |
| **MQTT_PORT** | integer | _1883 (if TLS is true: 8883)_ |
| **MQTT_USERNAME** | string | |
| **MQTT_PASSWORD** | string | |
| **MQTT_NAMESPACE** | string | |
| **MQTT_CLIENTID** | string | _4 char random string_ |
| **TESLA_API_HOST** | string | _retrieved by access token_ |
| Variable | Type | Default |
| ----------------------------- | ------- | ----------------------------- |
| **TESLAMATE_SSL** | boolean | _false_ |
| **TESLAMATE_HOST** | string | _teslamate_ |
| **TESLAMATE_PORT** | string | _4000_ |
| **API_TOKEN** | string | |
| **API_TOKEN_DISABLE** | string | _false_ |
| **DATABASE_PORT** | integer | _5432_ |
| **DATABASE_TIMEOUT** | integer | _60000_ |
| **DATABASE_SSL** | string | _disable_ |
| **DATABASE_SSL_CA_CERT_FILE** | string | |
| **DEBUG_MODE** | boolean | _false_ |
| **DISABLE_MQTT** | boolean | _false_ |
| **MQTT_TLS** | boolean | _false_ |
| **MQTT_PORT** | integer | _1883 (if TLS is true: 8883)_ |
| **MQTT_USERNAME** | string | |
| **MQTT_PASSWORD** | string | |
| **MQTT_NAMESPACE** | string | |
| **MQTT_CLIENTID** | string | _4 char random string_ |
| **TESLA_API_HOST** | string | _retrieved by access token_ |
**Commands** environment variables

41
src/webserver.go
View File

@@ -211,41 +211,48 @@ func main() {
// initDBconnection func
func initDBconnection() {
// declare error var for use insite initAPI
var err error
dbsslmode := "disable"
// creating connection string towards postgres
// read environment variables with defaults for connection string
dbhost := getEnv("DATABASE_HOST", "database")
dbport := getEnvAsInt("DATABASE_PORT", 5432)
dbuser := getEnv("DATABASE_USER", "teslamate")
dbpass := getEnv("DATABASE_PASS", "secret")
dbname := getEnv("DATABASE_NAME", "teslamate")
// dbpool := getEnvAsInt("DATABASE_POOL_SIZE", 10)
dbtimeout := (getEnvAsInt("DATABASE_TIMEOUT", 60000) / 1000)
dbssl := getEnvAsBool("DATABASE_SSL", false)
// dbipv6 := getEnvAsBool("DATABASE_IPV6", false)
if dbssl {
dbsslmode = "prefer"
dbsslmode := getEnv("DATABASE_SSL", "disable")
dbsslrootcert := getEnv("DATABASE_SSL_CA_CERT_FILE", "")
// convert boolean-like SSL mode for backwards compatibility
switch dbsslmode {
case "true", "noverify":
dbsslmode = "require"
case "false":
dbsslmode = "disable"
}
// construct connection string
psqlInfo := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=%s connect_timeout=%d", dbhost, dbport, dbuser, dbpass, dbname, dbsslmode, dbtimeout)
// opening connection to postgres
db, err = sql.Open("postgres", psqlInfo)
if err != nil {
log.Panic(err)
// add SSL certificate configuration if provided
if dbsslrootcert != "" {
psqlInfo += " sslrootcert=" + dbsslrootcert
}
// doing ping to database to test connection
err = db.Ping()
// open database connection
db, err = sql.Open("postgres", psqlInfo)
if err != nil {
log.Panic(err)
log.Fatalf("[error] initDBconnection - database connection error: %v", err)
}
// test database connection
if err = db.Ping(); err != nil {
log.Fatalf("[error] initDBconnection - database ping error: %v", err)
}
// showing database successfully connected
if gin.IsDebugging() {
log.Println("[debug] initDBconnection - successfully completed (connected to postgres).")
log.Println("[debug] initDBconnection - database connection established successfully.")
}
}