aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-01-26 15:08:35 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-01-26 15:08:35 +1300
commit3ba06ca19404c07587d86e83c10b5979c0e88e6f (patch)
tree66202caa207c5823f576b9aca08c840a6d43e057
parentAdd ~/.mailrc config (diff)
downloaddotfiles-3ba06ca19404c07587d86e83c10b5979c0e88e6f.tar.gz
dotfiles-3ba06ca19404c07587d86e83c10b5979c0e88e6f.zip
Allow specifying GnuPG keyserver
-rw-r--r--Makefile6
-rw-r--r--gnupg/gpg.conf.m42
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1e8664af..9a476a4b 100644
--- a/Makefile
+++ b/Makefile
@@ -126,8 +126,12 @@ git/gitconfig : git/gitconfig.m4
-D DOTFILES_SENDMAIL="$(SENDMAIL)" \
git/gitconfig.m4 > git/gitconfig
+KEYSERVER := hkps://hkps.pool.sks-keyservers.net
+
gnupg/gpg.conf : gnupg/gpg.conf.m4
- m4 -D DOTFILES_HOME="$(HOME)" \
+ m4 \
+ -D DOTFILES_HOME="$(HOME)" \
+ -D DOTFILES_KEYSERVER="$(KEYSERVER)" \
gnupg/gpg.conf.m4 > gnupg/gpg.conf
mail/mailrc : mail/mailrc.m4
diff --git a/gnupg/gpg.conf.m4 b/gnupg/gpg.conf.m4
index 8531a742..dbbed306 100644
--- a/gnupg/gpg.conf.m4
+++ b/gnupg/gpg.conf.m4
@@ -22,7 +22,7 @@ fixed-list-mode
keyid-format 0xlong
# Use a pool of servers which support HKPS (encrypted key retrieval)
-keyserver hkps://hkps.pool.sks-keyservers.net
+keyserver DOTFILES_KEYSERVER
# Retrieve keys automatically; check the keyserver port cert; use whichever
# server is proffered from the pool