summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-12-04 17:57:37 +0100
committerLudovic Courtès <ludo@gnu.org>2017-12-04 17:57:37 +0100
commitbe5622e7f1b2f4e4567214b209bfd153dfd59013 (patch)
tree752a11c5b715b21a20fbcc730d6e89e57e5a0d13
parentc735e9e6868bb7661f08ffa008f1feaedf2fcb9e (diff)
maint: Add 'berlin.guixsd.org.pub'.
* bayfront.guixsd.org.pub: Rename to... * berlin.guixsd.org.pub: ... this. * Makefile.am (dist_pkgdata_DATA): Adjust accordingly. * gnu/services/base.scm (%default-authorized-guix-keys): Likewise.
-rw-r--r--Makefile.am2
-rw-r--r--berlin.guixsd.org.pub (renamed from bayfront.guixsd.org.pub)0
-rw-r--r--gnu/services/base.scm2
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 7cc46d4ac21..ddbf7a7984d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -416,7 +416,7 @@ check-system: $(GOBJECTS) $(BOOTSTRAP_GUILE_TARBALLS)
416# Public key used to sign substitutes from hydra.gnu.org & co. 416# Public key used to sign substitutes from hydra.gnu.org & co.
417dist_pkgdata_DATA = \ 417dist_pkgdata_DATA = \
418 hydra.gnu.org.pub \ 418 hydra.gnu.org.pub \
419 bayfront.guixsd.org.pub 419 berlin.guixsd.org.pub
420 420
421# Bash completion file. 421# Bash completion file.
422dist_bashcompletion_DATA = etc/completion/bash/guix 422dist_bashcompletion_DATA = etc/completion/bash/guix
diff --git a/bayfront.guixsd.org.pub b/berlin.guixsd.org.pub
index f156a37b087..f156a37b087 100644
--- a/bayfront.guixsd.org.pub
+++ b/berlin.guixsd.org.pub
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 06b2a7d2d84..11f55c588cf 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1345,7 +1345,7 @@ failed to register hydra.gnu.org public key: ~a~%" status))))))))
1345(define %default-authorized-guix-keys 1345(define %default-authorized-guix-keys
1346 ;; List of authorized substitute keys. 1346 ;; List of authorized substitute keys.
1347 (list (file-append guix "/share/guix/hydra.gnu.org.pub") 1347 (list (file-append guix "/share/guix/hydra.gnu.org.pub")
1348 (file-append guix "/share/guix/bayfront.guixsd.org.pub"))) 1348 (file-append guix "/share/guix/berlin.guixsd.org.pub")))
1349 1349
1350(define-record-type* <guix-configuration> 1350(define-record-type* <guix-configuration>
1351 guix-configuration make-guix-configuration 1351 guix-configuration make-guix-configuration