aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/aerc.conf6
-rw-r--r--config/config.go6
2 files changed, 11 insertions, 1 deletions
diff --git a/config/aerc.conf b/config/aerc.conf
index 00c6c499..1a3c1f42 100644
--- a/config/aerc.conf
+++ b/config/aerc.conf
@@ -3,6 +3,12 @@
[general]
#
+# If set to "gpg", aerc will use system gpg binary and keystore for all crypto
+# operations. Otherwise, the internal openpgp implemenation will be used.
+#
+# Default: internal
+pgp-provider=internal
+
# By default, the file permissions of accounts.conf must be restrictive and
# only allow reading by the file owner (0600). Set this option to true to
# ignore this permission check. Use this with care as it may expose your
diff --git a/config/config.go b/config/config.go
index 0c9a40fd..8480f10a 100644
--- a/config/config.go
+++ b/config/config.go
@@ -104,6 +104,7 @@ type AccountConfig struct {
SignatureCmd string
EnableFoldersSort bool `ini:"enable-folders-sort"`
FoldersSort []string `ini:"folders-sort" delim:","`
+ PgpKeyId string `ini:"pgp-key-id"`
}
type BindingConfig struct {
@@ -248,6 +249,8 @@ func loadAccountConfig(path string) ([]AccountConfig, error) {
account.Archive = val
} else if key == "enable-folders-sort" {
account.EnableFoldersSort, _ = strconv.ParseBool(val)
+ } else if key == "pgp-key-id" {
+ account.PgpKeyId = val
} else if key != "name" {
account.Params[key] = val
}
@@ -582,13 +585,14 @@ func validateBorderChars(section *ini.Section, config *UIConfig) error {
func validatePgpProvider(section *ini.Section) error {
m := map[string]bool{
+ "gpg": true,
"internal": true,
}
for key, val := range section.KeysHash() {
switch key {
case "pgp-provider":
if !m[strings.ToLower(val)] {
- return fmt.Errorf("%v must be 'internal'", key)
+ return fmt.Errorf("%v must be either 'gpg' or 'internal'", key)
}
}
}