From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AAC5C138335 for ; Sat, 29 Jun 2019 03:57:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A70F6E07D7; Sat, 29 Jun 2019 03:57:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8EE3CE07D7 for ; Sat, 29 Jun 2019 03:57:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C6FF346C59 for ; Sat, 29 Jun 2019 03:57:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0135629 for ; Sat, 29 Jun 2019 03:57:41 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1561780650.23bc2a9ee83fd51687984befbb20a9d876b87569.robbat2@gentoo> Subject: [gentoo-commits] proj/qa-scripts:master commit in: / X-VCS-Repository: proj/qa-scripts X-VCS-Files: create-dev-keyrings.bash keyrings-recv-sks.bash X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 23bc2a9ee83fd51687984befbb20a9d876b87569 X-VCS-Branch: master Date: Sat, 29 Jun 2019 03:57:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 371e6b3c-99d7-49c9-8871-f1a1a6f3fabc X-Archives-Hash: b00968b98e00c7d630ee73d36bc99ff3 commit: 23bc2a9ee83fd51687984befbb20a9d876b87569 Author: Robin H. Johnson gentoo org> AuthorDate: Sat Jun 29 03:57:30 2019 +0000 Commit: Robin H. Johnson gentoo 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 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[@]}"