opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 03:12:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

change default sslmode for postgres to verify-full (#9736)

Browse Source
This commit is contained in:
Sven Klemm
2017-10-31 13:55:32 +01:00
committed by Daniel Lee
parent 948a5259a2
commit a503c1d39c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/sources/installation/configuration.md
View File

@ -551,7 +551,7 @@ session provider you have configured.
- **file:** session file path, e.g. `data/sessions` - **file:** session file path, e.g. `data/sessions`
- **mysql:** go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1:3306)/database_name` - **mysql:** go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1:3306)/database_name`
- **postgres:** ex: user=a password=b host=localhost port=5432 dbname=c sslmode=require - **postgres:** ex: user=a password=b host=localhost port=5432 dbname=c sslmode=verify-full
- **memcache:** ex: 127.0.0.1:11211 - **memcache:** ex: 127.0.0.1:11211
- **redis:** ex: `addr=127.0.0.1:6379,pool_size=100,prefix=grafana` - **redis:** ex: `addr=127.0.0.1:6379,pool_size=100,prefix=grafana`
@ -580,7 +580,7 @@ CREATE TABLE session (
); );
``` ```
Postgres valid `sslmode` are `disable`, `require` (default), `verify-ca`, and `verify-full`. Postgres valid `sslmode` are `disable`, `require`, `verify-ca`, and `verify-full` (default).
### cookie_name ### cookie_name

2
pkg/tsdb/postgres/postgres.go
View File

@ -51,7 +51,7 @@ func generateConnectionString(datasource *models.DataSource) string {
} }
} }
sslmode := datasource.JsonData.Get("sslmode").MustString("require") sslmode := datasource.JsonData.Get("sslmode").MustString("verify-full")
return fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=%s", datasource.User, password, datasource.Url, datasource.Database, sslmode) return fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=%s", datasource.User, password, datasource.Url, datasource.Database, sslmode)
} }