Просмотр исходного кода

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

Sven Klemm 8 лет назад
Родитель
Сommit
a503c1d39c
2 измененных файлов с 3 добавлено и 3 удалено
  1. 2 2
      docs/sources/installation/configuration.md
  2. 1 1
      pkg/tsdb/postgres/postgres.go

+ 2 - 2
docs/sources/installation/configuration.md

@@ -551,7 +551,7 @@ session provider you have configured.
 
 - **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`
-- **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
 - **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
 

+ 1 - 1
pkg/tsdb/postgres/postgres.go

@@ -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)
 }