01/04: guix-install.sh: Don't authorise hydra.gnu.org.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 414c4de15de50c9bbc1d7159418f52fdcc6dab13
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Fri Jun 28 16:13:44 2019 +0200

    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(-)

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index a0777c8..604c683 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"