From 4cc885f678727e96ac7c99b5927462864a4540ca Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 2 Jul 2018 14:33:15 +0100
Subject: [PATCH] Avoid possibly including the same keyserver twice
---
src/freedombone-adduser | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/freedombone-adduser b/src/freedombone-adduser
index 24568e797..a113d5021 100755
--- a/src/freedombone-adduser
+++ b/src/freedombone-adduser
@@ -119,9 +119,14 @@ fi
# generate a gpg key
echo "Making a GPG key for $ADD_USERNAME@$HOSTNAME"
mkdir "/home/$ADD_USERNAME/.gnupg"
-{ echo "keyserver $GPG_KEYSERVER";
- echo 'keyserver hkps://hkps.pool.sks-keyservers.net';
- echo 'keyserver-options auto-key-retrieve';
+if [[ "$GPG_KEYSERVER" != 'hkps://hkps.pool.sks-keyservers.net' ]]; then
+ { echo "keyserver $GPG_KEYSERVER";
+ echo 'keyserver hkps://hkps.pool.sks-keyservers.net'; } >> "/home/$ADD_USERNAME/.gnupg/gpg.conf"
+else
+ echo 'keyserver hkps://hkps.pool.sks-keyservers.net' >> "/home/$ADD_USERNAME/.gnupg/gpg.conf"
+fi
+
+{ echo 'keyserver-options auto-key-retrieve';
echo '';
echo '# default preferences';
echo 'personal-digest-preferences SHA256';
--
GitLab