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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9BA40158094 for ; Mon, 11 Jul 2022 01:26:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5B85E0E6F; Mon, 11 Jul 2022 01:26:14 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 95EE5E0E6F for ; Mon, 11 Jul 2022 01:26:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 842DC341090 for ; Mon, 11 Jul 2022 01:26:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD0DC391 for ; Mon, 11 Jul 2022 01:26:11 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1657502763.deb5eca88bc5eae48fd36cdcb09a3dcb8e4629bc.sam@gentoo> Subject: [gentoo-commits] proj/qa-scripts:master commit in: / X-VCS-Repository: proj/qa-scripts X-VCS-Files: keyrings-export.bash X-VCS-Directories: / X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: deb5eca88bc5eae48fd36cdcb09a3dcb8e4629bc X-VCS-Branch: master Date: Mon, 11 Jul 2022 01:26:11 +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: b381e9ca-c76f-4024-a260-bb85397d6b41 X-Archives-Hash: 49db97d3fc61874c38b71cd5d683154b commit: deb5eca88bc5eae48fd36cdcb09a3dcb8e4629bc Author: Sam James gentoo org> AuthorDate: Mon Jul 11 01:26:03 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jul 11 01:26:03 2022 +0000 URL: https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=deb5eca8 keyrings-export.bash: migrate keys into keys/ Signed-off-by: Sam James gentoo.org> keyrings-export.bash | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/keyrings-export.bash b/keyrings-export.bash index a890daf..aee9af2 100755 --- a/keyrings-export.bash +++ b/keyrings-export.bash @@ -17,24 +17,24 @@ 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_keys "${OUTPUT_DIR}"/service-keys.gpg \ +export_keys "${OUTPUT_DIR}"/keys/service-keys.gpg \ "${SYSTEM_KEYS[@]}" -export_keys "${OUTPUT_DIR}"/committing-devs.gpg \ +export_keys "${OUTPUT_DIR}"/keys/committing-devs.gpg \ "${COMMITTING_DEVS[@]}" -export_keys "${OUTPUT_DIR}"/active-devs.gpg \ +export_keys "${OUTPUT_DIR}"/keys/active-devs.gpg \ "${COMMITTING_DEVS[@]}" \ "${NONCOMMITTING_DEVS[@]}" -export_keys "${OUTPUT_DIR}"/infra-devs.gpg \ +export_keys "${OUTPUT_DIR}"/keys/infra-devs.gpg \ "${INFRA_DEVS[@]}" -export_keys "${OUTPUT_DIR}"/retired-devs.gpg \ +export_keys "${OUTPUT_DIR}"/keys/retired-devs.gpg \ "${RETIRED_DEVS[@]}" # Everybody together now -export_keys "${OUTPUT_DIR}"/all-devs.gpg \ +export_keys "${OUTPUT_DIR}"/keys/all-devs.gpg \ "${SYSTEM_KEYS[@]}" \ "${COMMITTING_DEVS[@]}" \ "${NONCOMMITTING_DEVS[@]}" \ @@ -42,6 +42,11 @@ export_keys "${OUTPUT_DIR}"/all-devs.gpg \ "${RETIRED_DEVS[@]}" for key in service-keys committing-devs active-devs infra-devs retired-devs all-devs ; do + if [[ ! -L keys/${key}.gpg ]] ; then + # Compatibility symlink + ln -s keys/${key}.gpg ${key}.gpg + fi + timestamp=$(date -u +%Y%m%d -d "monday") # Don't clobber existing timestamped keys for this period (weekly)