From f16930066931838cf10b327b1949b383632c2c36 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Tue, 23 Nov 2021 15:14:42 -0500 Subject: [PATCH] Encryption: Add settings to ini files (#42057) (#42166) * Encryption: Add settings to ini files * Rename a setting (cherry picked from commit 3af36b7e23e3bf9d538529ffffc86670508f8fe5) Co-authored-by: Tania B --- conf/defaults.ini | 5 ++++- conf/sample.ini | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 307e2b33ea0..223df91e273 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -228,9 +228,12 @@ admin_password = admin # used for signing 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 +# list of configured key providers, space separated (Enterprise only): e.g., awskms.v1 azurekv.v1 +available_encryption_providers = + # disable gravatar profile images disable_gravatar = false diff --git a/conf/sample.ini b/conf/sample.ini index e75d5130744..165882f4588 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -222,9 +222,12 @@ # used for signing ;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 +# list of configured key providers, space separated (Enterprise only): e.g., awskms.v1 azurekv.v1 +;available_encryption_providers = + # disable gravatar profile images ;disable_gravatar = false