From 3af36b7e23e3bf9d538529ffffc86670508f8fe5 Mon Sep 17 00:00:00 2001 From: Tania B Date: Tue, 23 Nov 2021 20:29:35 +0200 Subject: [PATCH] Encryption: Add settings to ini files (#42057) * Encryption: Add settings to ini files * Rename a setting --- 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 b21b7797121..bcc8ca713cd 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 e655d4078b1..eb1edccf4bc 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