Skip to content

Commit 0b8663c

Browse files
sirainencmouse
authored andcommitted
data/settings: Remove nonexistent crypt_global_private_keys
The setting is crypt_global_private_key.
1 parent 6a966fd commit 0b8663c

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

data/settings.js

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2720,15 +2720,6 @@ the user's key pair.
27202720
For EdDSA, you need to use X448 or X25519, case sensitive.`
27212721
},
27222722

2723-
crypt_global_private_keys: {
2724-
plugin: 'mail-crypt',
2725-
values: setting_types.NAMED_LIST_FILTER,
2726-
seealso: [ 'crypt_private_key_file', 'crypt_private_key_password' ],
2727-
text: `
2728-
List of private keys to decrypt files. Add [[setting,crypt_private_key_file]]
2729-
and optionally [[setting,crypt_private_key_password]] inside each filter.`
2730-
},
2731-
27322723
crypt_global_public_key_file: {
27332724
plugin: 'mail-crypt',
27342725
values: setting_types.FILE,
@@ -2796,11 +2787,11 @@ regardless of this setting.`
27962787
plugin: 'mail-crypt',
27972788
values: setting_types.STRING,
27982789
seealso: [
2799-
'crypt_global_private_keys',
2790+
'crypt_global_private_key',
28002791
'crypt_user_key_encryption_key',
28012792
],
28022793
text: `
2803-
Name of the private key inside [[setting,crypt_global_private_keys]] or
2794+
Name of the private key inside [[setting,crypt_global_private_key]] or
28042795
[[setting,crypt_user_key_encryption_key]].`
28052796
},
28062797

@@ -2809,15 +2800,15 @@ Name of the private key inside [[setting,crypt_global_private_keys]] or
28092800
values: setting_types.FILE,
28102801
seealso: [
28112802
'[[link,mail_crypt_converting_ec_key_to_pkey]]',
2812-
'crypt_global_private_keys',
2803+
'crypt_global_private_key',
28132804
'crypt_user_key_encryption_key',
28142805
],
28152806
text: `
28162807
Private key in [[link,mail_crypt_converting_ec_key_to_pkey]]. The PEM key may
28172808
additionally be base64-encoded into a single line, which can make it easier to
28182809
store into userdb extra fields.
28192810
2820-
Used inside [[setting,crypt_global_private_keys]] and
2811+
Used inside [[setting,crypt_global_private_key]] and
28212812
[[setting,crypt_user_key_encryption_key]] lists.`
28222813
},
28232814

0 commit comments

Comments
 (0)