Skip to content
Snippets Groups Projects
Commit 4cc885f6 authored by Bob Mottram's avatar Bob Mottram
Browse files

Avoid possibly including the same keyserver twice

parent dd800f7d
No related branches found
No related tags found
No related merge requests found
...@@ -119,9 +119,14 @@ fi ...@@ -119,9 +119,14 @@ fi
# generate a gpg key # generate a gpg key
echo "Making a GPG key for $ADD_USERNAME@$HOSTNAME" echo "Making a GPG key for $ADD_USERNAME@$HOSTNAME"
mkdir "/home/$ADD_USERNAME/.gnupg" mkdir "/home/$ADD_USERNAME/.gnupg"
{ echo "keyserver $GPG_KEYSERVER"; if [[ "$GPG_KEYSERVER" != 'hkps://hkps.pool.sks-keyservers.net' ]]; then
echo 'keyserver hkps://hkps.pool.sks-keyservers.net'; { echo "keyserver $GPG_KEYSERVER";
echo 'keyserver-options auto-key-retrieve'; 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 '';
echo '# default preferences'; echo '# default preferences';
echo 'personal-digest-preferences SHA256'; echo 'personal-digest-preferences SHA256';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment