From f49682a09e081789edb4dc3f65c35e9d800a702b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Sep 2021 17:43:10 +0200 Subject: [PATCH] guix-install.sh: Authorize all project build farms at once. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/guix-install.sh (sys_authorize_build_farms): Iterate over all hosts. Co-authored-by: Ludovic Courtès --- etc/guix-install.sh | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 6bef21bb7e..fb9006b3e2 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -492,14 +492,22 @@ sys_enable_guix_daemon() } sys_authorize_build_farms() -{ # authorize the public key of the build farm +{ # authorize the public key(s) of the build farm(s) + local hosts=( + ci.guix.gnu.org + bordeaux.guix.gnu.org + ) + if prompt_yes_no "Permit downloading pre-built package binaries from the \ -project's build farm?"; then - guix archive --authorize \ - < ~root/.config/guix/current/share/guix/ci.guix.gnu.org.pub \ - && _msg "${PAS}Authorized public key for ci.guix.gnu.org" - else - _msg "${INF}Skipped authorizing build farm public keys" +project's build farms?"; then + for host in "${hosts[@]}"; do + local key=~root/.config/guix/current/share/guix/$host.pub + [ -f "$key" ] \ + && guix archive --authorize < "$key" \ + && _msg "${PAS}Authorized public key for $host" + done + else + _msg "${INF}Skipped authorizing build farm public keys" fi }