[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/04: etc: Remove hydra.gnu.org.pub key.
From: |
guix-commits |
Subject: |
04/04: etc: Remove hydra.gnu.org.pub key. |
Date: |
Sat, 29 Jun 2019 08:54:14 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 3a8bfebed94ba295432da8304b7ffb4a611ef761
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Fri Jun 28 16:33:01 2019 +0200
etc: Remove hydra.gnu.org.pub key.
* etc/substitutes/hydra.gnu.org.pub: Delete file.
* guix/self.scm (miscellaneous-files): Don't install it.
* Makefile.am (dist_pkgdata_DATA): Remove it.
* gnu/services/base.scm (%default-authorized-guix-keys): Likewise.
(hydra-key-authorization): Rename to…
(substitute-key-authorization): …this. Adjust only call site.
---
Makefile.am | 3 +--
etc/substitutes/hydra.gnu.org.pub | 6 ------
gnu/services/base.scm | 7 +++----
gnu/system/install.scm | 4 ++--
guix/self.scm | 3 ---
5 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 80be73e..8adf23c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -489,9 +489,8 @@ check-system: $(GOBJECTS)
-e '(@@ (run-system-tests) run-system-tests)' \
$(top_srcdir)/build-aux/run-system-tests.scm
-# Public key used to sign substitutes from hydra.gnu.org & co.
+# Public keys used to sign substitutes.
dist_pkgdata_DATA = \
- etc/substitutes/hydra.gnu.org.pub \
etc/substitutes/berlin.guixsd.org.pub \
etc/substitutes/ci.guix.gnu.org.pub \
etc/substitutes/ci.guix.info.pub
diff --git a/etc/substitutes/hydra.gnu.org.pub
b/etc/substitutes/hydra.gnu.org.pub
deleted file mode 100644
index 6db597e..0000000
--- a/etc/substitutes/hydra.gnu.org.pub
+++ /dev/null
@@ -1,6 +0,0 @@
- (public-key
- (rsa
- (n
#00DB1634E3D9DFAC97AE4734DAE968CCB15EE4815C82BDC254883DBB49FE1EF32268E82D4BBE0E35298C481C9DA1551642FAFF05AEC1A60712F1BB4BE7D25D7EFF7A4F89704A5A9AC232870CB9F2476C3B538A0E990A8825DEB73081D317001FB8A188600F2FEF5F5F570E857F3EE4355077A3C3918ED72723A56BA55C466D400658974D7DAD1F6B7B63C192B9C2704D98BBFF1C3BD5B8EF11A8ADC83ACB8FD8E9F1E792FDAD262415D13F2DEE55F330908CFDA9C3C8C32B64F7DD088457D34F445E2E2C83C6D680549DC9B6E6573B89496567204ED285E67A279F2F667080BA941D80D015CE87B0FB6A91A99CECC7D91D2D2
[...]
- (e #010001#)
- )
- )
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 3c1827f..537d30a 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1533,7 +1533,7 @@ GID."
(('gnu rest ...) #t)
(rest #f)))
-(define (hydra-key-authorization keys guix)
+(define (substitute-key-authorization keys guix)
"Return a gexp with code to register KEYS, a list of files containing 'guix
archive' public keys, with GUIX."
(define default-acl
@@ -1570,8 +1570,7 @@ archive' public keys, with GUIX."
(define %default-authorized-guix-keys
;; List of authorized substitute keys.
- (list (file-append guix "/share/guix/hydra.gnu.org.pub")
- (file-append guix "/share/guix/berlin.guixsd.org.pub")))
+ (list (file-append guix "/share/guix/berlin.guixsd.org.pub")))
(define-record-type* <guix-configuration>
guix-configuration make-guix-configuration
@@ -1688,7 +1687,7 @@ archive' public keys, with GUIX."
;; Optionally authorize substitute server keys.
(if authorize-key?
- (hydra-key-authorization keys guix)
+ (substitute-key-authorization keys guix)
#~#f))))
(define* (references-file item #:optional (name "references"))
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 453b0bd..9120960 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -330,8 +330,8 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
;; The usual services.
(syslog-service)
- ;; The build daemon. Register the hydra.gnu.org key as trusted.
- ;; This allows the installation process to use substitutes by
+ ;; The build daemon. Register the default substitute server key(s)
+ ;; as trusted to allow the installation process to use substitutes by
;; default.
(service guix-service-type
(guix-configuration (authorize-key? #t)))
diff --git a/guix/self.scm b/guix/self.scm
index 69e2381..be90b60 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -577,9 +577,6 @@ load path."
,(file-append* source "/etc/completion/zsh/_guix"))
("share/fish/vendor_completions.d/guix.fish"
,(file-append* source "/etc/completion/fish/guix.fish"))
- ("share/guix/hydra.gnu.org.pub"
- ,(file-append* source
- "/etc/substitutes/hydra.gnu.org.pub"))
("share/guix/berlin.guixsd.org.pub"
,(file-append* source
"/etc/substitutes/berlin.guixsd.org.pub"))