diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2019-07-31 10:10:16 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-07-31 10:10:16 +1200 |
commit | dd1bf644e3d3d478a166e979e018900b03763994 (patch) | |
tree | c9cf18223cc016a42cbed1b99626519af60166d2 /gnupg | |
parent | Merge branch 'release/v7.2.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-d00d752fbd000e589bb48815f804f3047b665fd1.tar.gz (sig) dotfiles-d00d752fbd000e589bb48815f804f3047b665fd1.zip |
Merge branch 'release/v7.3.0'v7.3.0
* release/v7.3.0:
Add gnupg/dirmngr.conf
Remove useless GnuPG options
Fix an anachronism
Diffstat (limited to 'gnupg')
-rw-r--r-- | gnupg/dirmngr.conf | 1 | ||||
-rw-r--r-- | gnupg/gpg-agent.conf | 2 | ||||
-rw-r--r-- | gnupg/gpg.conf | 3 |
3 files changed, 1 insertions, 5 deletions
diff --git a/gnupg/dirmngr.conf b/gnupg/dirmngr.conf new file mode 100644 index 00000000..14114144 --- /dev/null +++ b/gnupg/dirmngr.conf @@ -0,0 +1 @@ +keyserver hkps://keys.openpgp.org diff --git a/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf deleted file mode 100644 index c50602c5..00000000 --- a/gnupg/gpg-agent.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Cache keys for two hours -default-cache-ttl 7200 diff --git a/gnupg/gpg.conf b/gnupg/gpg.conf index 7ef1c07d..96868715 100644 --- a/gnupg/gpg.conf +++ b/gnupg/gpg.conf @@ -3,6 +3,3 @@ default-recipient-self # Suppress the copyright message no-greeting - -# Use the GPG agent for key management and decryption -use-agent |