diff options
| author | Aleksander Machniak <alec@alec.pl> | 2020-07-31 11:12:29 +0300 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2020-07-31 11:12:29 +0300 |
| commit | 18f2693364d6c42101bfc0b483e27f1a24ac136c (patch) | |
| tree | bc7463e555a2debd9263ff94d42358ccdf921e3f /config | |
| parent | 38ffc55bc88d3452dbe2e83151372f0a11d4bd53 (diff) | |
| parent | 9d39c0a05f403739268230074ac5a67e2f9d1e60 (diff) | |
Merge branch 'mailvelope-fixes' of https://github.com/gurnec/roundcubemail into gurnec-mailvelope-fixes
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.inc.php.sample | 4 | ||||
| -rw-r--r-- | config/defaults.inc.php | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/config/config.inc.php.sample b/config/config.inc.php.sample index 99a54c495..0279a7211 100644 --- a/config/config.inc.php.sample +++ b/config/config.inc.php.sample @@ -86,3 +86,7 @@ $config['plugins'] = array( // skin name: folder from skins/ $config['skin'] = 'elastic'; + +// Use the Main Keyring in Mailvelope? If not, use (creating if required) +// a per-site keyring. Most sites use the Main Keyring, so set this to true. +$config['mailvelope_main_keyring'] = true; diff --git a/config/defaults.inc.php b/config/defaults.inc.php index 668301436..b3ceae69d 100644 --- a/config/defaults.inc.php +++ b/config/defaults.inc.php @@ -855,6 +855,14 @@ $config['compose_responses_static'] = array( // Note: Lookup is client-side, so the server must support Cross-Origin Resource Sharing $config['keyservers'] = array('keys.openpgp.org'); +// Use the Main Keyring in Mailvelope? If not, use (creating if required) +// a per-site keyring. This is set to false for backwards compatibility. +$config['mailvelope_main_keyring'] = false; + +// Mailvelope RSA bit size for newly generated keys, either 2048 or 4096. +// It maybe desirable to use 2048 for sites with many mobile users. +$config['mailvelope_keysize'] = 4096; + // ---------------------------------- // ADDRESSBOOK SETTINGS // ---------------------------------- |