summary refs log tree commit diff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2019-06-28 16:13:44 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2019-06-29 06:28:50 +0200
commit414c4de15de50c9bbc1d7159418f52fdcc6dab13 (patch)
tree16f126f0774694b18c28993bb56b9ca7f508f1d4
parenta3efe269b5e343c6b2593997a6f3fdc8d96976b8 (diff)
downloadguix-414c4de15de50c9bbc1d7159418f52fdcc6dab13.tar.gz
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.
-rwxr-xr-xetc/guix-install.sh8
1 files changed, 3 insertions, 5 deletions
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"