apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Encryption: Add settings to ini files (#42057)

Browse Source 
* Encryption: Add settings to ini files

* Rename a setting
pull/42175/head
Tania B 4 years ago committed by GitHub
parent a5b29aed29
commit 3af36b7e23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      conf/defaults.ini
  2. 5
      conf/sample.ini

5
conf/defaults.ini
Unescape View File

@ -228,9 +228,12 @@ admin_password = admin
# used for signing # used for signing
secret_key = SW2YcwTIb9zpOOhoPsMm secret_key = SW2YcwTIb9zpOOhoPsMm
# key provider used for envelope encryption, default to static value specified by secret_key # current key provider used for envelope encryption, default to static value specified by secret_key
encryption_provider = secretKey encryption_provider = secretKey
# list of configured key providers, space separated (Enterprise only): e.g., awskms.v1 azurekv.v1
available_encryption_providers =
# disable gravatar profile images # disable gravatar profile images
disable_gravatar = false disable_gravatar = false

5
conf/sample.ini
Unescape View File

@ -222,9 +222,12 @@
# used for signing # used for signing
;secret_key = SW2YcwTIb9zpOOhoPsMm ;secret_key = SW2YcwTIb9zpOOhoPsMm
# key provider used for envelope encryption, default to static value specified by secret_key # current key provider used for envelope encryption, default to static value specified by secret_key
;encryption_provider = secretKey ;encryption_provider = secretKey
# list of configured key providers, space separated (Enterprise only): e.g., awskms.v1 azurekv.v1
;available_encryption_providers =
# disable gravatar profile images # disable gravatar profile images
;disable_gravatar = false ;disable_gravatar = false

Write Preview
Loading…
Cancel
Save