[gentoo-commits] proj/qa-scripts:master commit in: /

[Robin H. Johnson]

commit:     23bc2a9ee83fd51687984befbb20a9d876b87569
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 29 03:57:30 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 03:57:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=23bc2a9e

keyrings: enable OpenPGP Hagrid server

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 create-dev-keyrings.bash | 2 +-
 keyrings-recv-sks.bash   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/create-dev-keyrings.bash b/create-dev-keyrings.bash
index f2772d8..65b2b14 100755
--- a/create-dev-keyrings.bash
+++ b/create-dev-keyrings.bash
@@ -11,7 +11,7 @@ source "${BASEDIR}"/keyrings.inc.bash
 set -e
 export_ldap_data_to_env
 
-export KEYSERVERS=( "${KS_SKS}" "${KS_GENTOO}" )
+export KEYSERVERS=( "${KS_SKS}" "${KS_OPENPGP}" "${KS_GENTOO}" )
 export KEYSERVER_TIMEOUT=20m
 
 grab_keys "${SYSTEM_KEYS[@]}"

diff --git a/keyrings-recv-sks.bash b/keyrings-recv-sks.bash
index 65607d6..5ab91c3 100755
--- a/keyrings-recv-sks.bash
+++ b/keyrings-recv-sks.bash
@@ -15,7 +15,7 @@ export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b 
"${DEV_BASE}" "${NONC
 export -a RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" 
"${RETIRED_RULE}") )
 export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" 
"${NONCOMMIT_RULE}") )
 
-export KEYSERVERS=( "${KS_SKS}" )
+export KEYSERVERS=( "${KS_SKS}" "${KS_OPENPGP}" )
 export KEYSERVER_TIMEOUT=20m
 
 grab_keys "${SYSTEM_KEYS[@]}"