diff mbox series

[bug#33600,1/3] etc: Add "ci.guix.info.pub" public key file.

Message ID 20181203155335.10629-1-ludo@gnu.org
State Accepted
Commit 6a837b6062ab405f6ca6d9c0163836769098d89b
Headers show
Series Defaulting to ci.guix.info (aka. berlin.guixsd.org) | expand

Checks

Context Check Description
cbaines/applying patch success Successfully applied

Commit Message

Ludovic Courtès Dec. 3, 2018, 3:53 p.m. UTC 
* etc/substitutes/ci.guix.info.pub: New file.
* Makefile.am (dist_pkgdata_DATA): Add it.
* guix/self.scm (miscellaneous-files): Add
"share/guix/ci.guix.info.pub".
---
 Makefile.am                      | 3 ++-
 etc/substitutes/ci.guix.info.pub | 1 +
 guix/self.scm                    | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 120000 etc/substitutes/ci.guix.info.pub

Comments

Ricardo Wurmus Dec. 3, 2018, 8:44 p.m. UTC | #1 
Ludovic Courtès <ludo@gnu.org> writes:

> * etc/substitutes/ci.guix.info.pub: New file.
> * Makefile.am (dist_pkgdata_DATA): Add it.
> * guix/self.scm (miscellaneous-files): Add
> "share/guix/ci.guix.info.pub".

LGTM!
diff mbox series

Patch

diff --git a/Makefile.am b/Makefile.am
index 32cebd5917..6803666a57 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -459,7 +459,8 @@  check-system: $(GOBJECTS)
 # Public key used to sign substitutes from hydra.gnu.org & co.
 dist_pkgdata_DATA =				\
   etc/substitutes/hydra.gnu.org.pub		\
-  etc/substitutes/berlin.guixsd.org.pub
+  etc/substitutes/berlin.guixsd.org.pub		\
+  etc/substitutes/ci.guix.info.pub
 
 # Bash completion file.
 dist_bashcompletion_DATA = etc/completion/bash/guix	\
diff --git a/etc/substitutes/ci.guix.info.pub b/etc/substitutes/ci.guix.info.pub
new file mode 120000
index 0000000000..b1d1e4d763
--- /dev/null
+++ b/etc/substitutes/ci.guix.info.pub
@@ -0,0 +1 @@ 
+berlin.guixsd.org.pub
\ No newline at end of file
diff --git a/guix/self.scm b/guix/self.scm
index 8476c422ec..f2db3dbf52 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -428,6 +428,9 @@  load path."
                    ,(file-append* source
                                   "/etc/substitutes/hydra.gnu.org.pub"))
                   ("share/guix/berlin.guixsd.org.pub"
+                   ,(file-append* source
+                                  "/etc/substitutes/berlin.guixsd.org.pub"))
+                  ("share/guix/ci.guix.info.pub"  ;alias
                    ,(file-append* source "/etc/substitutes/berlin.guixsd.org.pub")))))
 
 (define* (whole-package name modules dependencies