From 414c4de15de50c9bbc1d7159418f52fdcc6dab13 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 28 Jun 2019 16:13:44 +0200 Subject: guix-install.sh: Don't authorise hydra.gnu.org. * etc/guix-install.sh (sys_authorize_build_farms): Authorise only ci.guix.gnu.org and make all references to it singular. --- etc/guix-install.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'etc/guix-install.sh') diff --git a/etc/guix-install.sh b/etc/guix-install.sh index a0777c8bfe..604c683202 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -362,13 +362,11 @@ sys_enable_guix_daemon() } sys_authorize_build_farms() -{ # authorize the public keys of the two build farms +{ # authorize the public key of the build farm while true; do - read -p "Permit downloading pre-built package binaries from the project's build farms? (yes/no) " yn + read -p "Permit downloading pre-built package binaries from the project's build farm? (yes/no) " yn case $yn in - [Yy]*) guix archive --authorize < "${ROOT_HOME}/.config/guix/current/share/guix/hydra.gnu.org.pub" && - _msg "${PAS}Authorized public key for hydra.gnu.org"; - guix archive --authorize < "${ROOT_HOME}/.config/guix/current/share/guix/ci.guix.gnu.org.pub" && + [Yy]*) guix archive --authorize < "${ROOT_HOME}/.config/guix/current/share/guix/ci.guix.gnu.org.pub" && _msg "${PAS}Authorized public key for ci.guix.gnu.org"; break;; [Nn]*) _msg "${INF}Skipped authorizing build farm public keys" -- cgit v1.2.3 From cea5db1b8454c02452bed8cbe6eb89ce37164fe8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 1 Jul 2019 23:31:24 +0200 Subject: etc: Do not recommend use of SKS key servers. * etc/guix-install.sh: Recommend downloading the GPG key from Savannah. --- etc/guix-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc/guix-install.sh') diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 604c683202..aa95cb4e20 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -104,7 +104,7 @@ chk_require() gpg --list-keys ${OPENPGP_SIGNING_KEY_ID} >/dev/null 2>&1 || ( _err "${ERR}Missing OpenPGP public key. Fetch it with this command:" - echo " gpg --keyserver pool.sks-keyservers.net --recv-keys ${OPENPGP_SIGNING_KEY_ID}" + echo " wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import -" exit 1 ) } -- cgit v1.2.3