Merge pull request #88 from dbernheisel/db-add-more-keyservers

Add more keyservers
asdf-vm · Jul 23, 2018 · 9f3e93d · 9f3e93d
2 parents bdc5057 + 9d323d3
commit 9f3e93d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/bin/import-previous-release-team-keyring b/bin/import-previous-release-team-keyring
@@ -9,12 +9,16 @@ KEYS="9554F04D7259F04124DE6B476D5A82AC7E37093B \
       56730D5401028683275BD23C23EFEFE93C4CFFFE \
       7937DFD2AB06298B2293C3187D33FF9D0246406D"
 
-
-SERVERS="ipv4.pool.sks-keyservers.net \
-         pgp.mit.edu"
+SERVERS="ha.pool.sks-keyservers.net
+         p80.pool.sks-keyservers.net:80 \
+         ipv4.pool.sks-keyservers.net \
+         keyserver.ubuntu.com
+         keyserver.ubuntu.com:80 \
+         pgp.mit.edu
+         pgp.mit.edu:80"
 
 for key in $KEYS; do
   for server in $SERVERS; do
-    gpg --keyserver hkp://$server:80 --recv-keys $key && break
+    gpg --keyserver "hkp://$server" --recv-keys "$key" && break
   done
 done
diff --git a/bin/import-release-team-keyring b/bin/import-release-team-keyring
@@ -12,11 +12,16 @@ KEYS="94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
       77984A986EBC2AA786BC0F66B01FBB92821C587A"
 
-SERVERS="ipv4.pool.sks-keyservers.net \
-         pgp.mit.edu"
+SERVERS="ha.pool.sks-keyservers.net
+         p80.pool.sks-keyservers.net:80 \
+         ipv4.pool.sks-keyservers.net \
+         keyserver.ubuntu.com
+         keyserver.ubuntu.com:80 \
+         pgp.mit.edu
+         pgp.mit.edu:80"
 
 for key in $KEYS; do
   for server in $SERVERS; do
-    gpg --keyserver hkp://$server:80 --recv-keys $key && break
+    gpg --keyserver "hkp://$server" --recv-keys "$key" && break
   done
 done