branch master updated: hydra: Deduplicate the data.guix.gnu.org substitute signing key.

[Christopher Baines]

This is an automated email from the git hooks/post-receive script.

cbaines pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new 8070ab1  hydra: Deduplicate the data.guix.gnu.org substitute signing 
key.
8070ab1 is described below

commit 8070ab15dbd764fdaf9cb9e291b61f5f477409a1
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Sun Feb 20 14:09:39 2022 +0000

    hydra: Deduplicate the data.guix.gnu.org substitute signing key.
    
    * hydra/keys/guix/data.guix.gnu.org.pub: New file.
    * hydra/bayfront.scm, hydra/harbourfront.scm, hydra/milano-guix-1.scm:
    Use it.
---
 hydra/bayfront.scm                    | 10 +---------
 hydra/harbourfront.scm                | 10 +---------
 hydra/keys/guix/data.guix.gnu.org.pub |  6 ++++++
 hydra/milano-guix-1.scm               | 10 +---------
 4 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm
index d06cd90..4984057 100644
--- a/hydra/bayfront.scm
+++ b/hydra/bayfront.scm
@@ -1080,15 +1080,7 @@ access_log  /var/log/nginx/bordeaux.access.log;"))
                     (cons*
                      (local-file "keys/guix/bayfront.guix.info-export.pub")
                      ;; for substituting derivations
-                     (plain-file
-                      "data.guix.gnu.org.pub"
-                      "
-(public-key
- (ecc
-  (curve Ed25519)
-  (q #1EEE5340C3AAD6E062A1395A88A86FC75982E8BC7DCBAE171858EEAAB14AAB77#)
-  )
- )")
+                     (local-file "keys/guix/data.guix.gnu.org.pub")
                      %build-node-keys))
 
                    (max-silent-time (* 12 3600))
diff --git a/hydra/harbourfront.scm b/hydra/harbourfront.scm
index d5b7044..9029cb0 100644
--- a/hydra/harbourfront.scm
+++ b/hydra/harbourfront.scm
@@ -105,13 +105,5 @@
                                          (authorized-keys
                                           (cons*
                                            ;; for substituting derivations
-                                           (plain-file
-                                            "data.guix.gnu.org.pub"
-                                            "
-(public-key
- (ecc
-  (curve Ed25519)
-  (q #1EEE5340C3AAD6E062A1395A88A86FC75982E8BC7DCBAE171858EEAAB14AAB77#)
-  )
- )")
+                                           (local-file 
"keys/guix/data.guix.gnu.org.pub")
                                            
%default-authorized-guix-keys))))))))
diff --git a/hydra/keys/guix/data.guix.gnu.org.pub 
b/hydra/keys/guix/data.guix.gnu.org.pub
new file mode 100644
index 0000000..66e267e
--- /dev/null
+++ b/hydra/keys/guix/data.guix.gnu.org.pub
@@ -0,0 +1,6 @@
+(public-key
+ (ecc
+  (curve Ed25519)
+  (q #1EEE5340C3AAD6E062A1395A88A86FC75982E8BC7DCBAE171858EEAAB14AAB77#)
+  )
+ )
diff --git a/hydra/milano-guix-1.scm b/hydra/milano-guix-1.scm
index b3f23d0..1b73eed 100644
--- a/hydra/milano-guix-1.scm
+++ b/hydra/milano-guix-1.scm
@@ -161,13 +161,5 @@
                           (cons*
                            (local-file 
"keys/guix/bayfront.guix.info-export.pub")
                            ;; for substituting derivations
-                           (plain-file
-                            "data.guix.gnu.org.pub"
-                            "
-(public-key
- (ecc
-  (curve Ed25519)
-  (q #1EEE5340C3AAD6E062A1395A88A86FC75982E8BC7DCBAE171858EEAAB14AAB77#)
-  )
- )")
+                           (local-file "keys/guix/data.guix.gnu.org.pub")
                            %authorized-guix-keys))))))))