| 1 |
commit: 23bc2a9ee83fd51687984befbb20a9d876b87569 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 29 03:57:30 2019 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 29 03:57:30 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=23bc2a9e |
| 7 |
|
| 8 |
keyrings: enable OpenPGP Hagrid server |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
|
| 12 |
create-dev-keyrings.bash | 2 +- |
| 13 |
keyrings-recv-sks.bash | 2 +- |
| 14 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/create-dev-keyrings.bash b/create-dev-keyrings.bash |
| 17 |
index f2772d8..65b2b14 100755 |
| 18 |
--- a/create-dev-keyrings.bash |
| 19 |
+++ b/create-dev-keyrings.bash |
| 20 |
@@ -11,7 +11,7 @@ source "${BASEDIR}"/keyrings.inc.bash |
| 21 |
set -e |
| 22 |
export_ldap_data_to_env |
| 23 |
|
| 24 |
-export KEYSERVERS=( "${KS_SKS}" "${KS_GENTOO}" ) |
| 25 |
+export KEYSERVERS=( "${KS_SKS}" "${KS_OPENPGP}" "${KS_GENTOO}" ) |
| 26 |
export KEYSERVER_TIMEOUT=20m |
| 27 |
|
| 28 |
grab_keys "${SYSTEM_KEYS[@]}" |
| 29 |
|
| 30 |
diff --git a/keyrings-recv-sks.bash b/keyrings-recv-sks.bash |
| 31 |
index 65607d6..5ab91c3 100755 |
| 32 |
--- a/keyrings-recv-sks.bash |
| 33 |
+++ b/keyrings-recv-sks.bash |
| 34 |
@@ -15,7 +15,7 @@ export -a NONCOMMITTING_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${NONC |
| 35 |
export -a RETIRED_DEVS=( $(grab_ldap_fingerprints -b "${DEV_BASE}" "${RETIRED_RULE}") ) |
| 36 |
export -a SYSTEM_KEYS=( $(grab_ldap_fingerprints -b "${SYSTEM_BASE}" "${NONCOMMIT_RULE}") ) |
| 37 |
|
| 38 |
-export KEYSERVERS=( "${KS_SKS}" ) |
| 39 |
+export KEYSERVERS=( "${KS_SKS}" "${KS_OPENPGP}" ) |
| 40 |
export KEYSERVER_TIMEOUT=20m |
| 41 |
|
| 42 |
grab_keys "${SYSTEM_KEYS[@]}" |
Archives