02/03: hydra: Authorize berlin.guixsd.org keys on berlin.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository maintenance.

commit 263ad448313be709e27e7b2a0d0525d241a9fbcc
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Oct 1 15:49:22 2020 +0200

    hydra: Authorize berlin.guixsd.org keys on berlin.
    
    * hydra/berlin.scm (childhurd-os) <openssh-configuration>: Authorize
    "berlin.guixsd.org.pub", not "hydra.gnu.org.pub".
    * hydra/build-machine.scm (%sysadmins): Likewise.
    (%authorized-guix-keys): Authorize "berlin.guixsd.org-export.pub", not
    "hydra.gnu.org-export.pub".
    * hydra/modules/sysadmin/build-machines.scm (berlin-new-build-machine-os)
    [childhurd-os] <openssh-configuration>: Likewise.
    [sysadmins]: Likewise.
---
 hydra/berlin.scm                          | 2 +-
 hydra/build-machine.scm                   | 6 +++---
 hydra/modules/sysadmin/build-machines.scm | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index 1bfe3d3..00b6854 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -158,7 +158,7 @@ Happy hacking!\n"))
               (openssh-configuration
                (inherit config)
                (authorized-keys
-                `(("hydra" ,(local-file "keys/ssh/hydra.gnu.org.pub")))))))))))
+                `(("hydra" ,(local-file 
"keys/ssh/berlin.guixsd.org.pub")))))))))))
 
 (define (childhurd-net-options id)
   "Expose SSH and VNC ports on 0.0.0.0; for first Childhurd VM those
diff --git a/hydra/build-machine.scm b/hydra/build-machine.scm
index 1b54f82..e5b1efe 100644
--- a/hydra/build-machine.scm
+++ b/hydra/build-machine.scm
@@ -1,5 +1,5 @@
 ;; GuixSD configuration file for the build machines.
-;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+;; Copyright © 2016, 2017, 2020 Ludovic Courtès <ludo@gnu.org>
 ;; Released under the GNU GPLv3 or any later version.
 
 (use-modules (sysadmin people)
@@ -15,11 +15,11 @@
                   (full-name "Hydra User")
                   (restricted? #t)
                   (ssh-public-key
-                   (local-file "keys/ssh/hydra.gnu.org.pub")))))
+                   (local-file "keys/ssh/berlin.guixsd.org.pub")))))
 
 (define %authorized-guix-keys
   ;; List of authorized 'guix archive' keys.
-  (list (local-file "keys/guix/hydra.gnu.org-export.pub")))
+  (list (local-file "keys/guix/berlin.guixsd.org-export.pub")))
 
 ;; The actual machine.
 (build-machine-os "chapters" %sysadmins
diff --git a/hydra/modules/sysadmin/build-machines.scm 
b/hydra/modules/sysadmin/build-machines.scm
index 643893f..866bd10 100644
--- a/hydra/modules/sysadmin/build-machines.scm
+++ b/hydra/modules/sysadmin/build-machines.scm
@@ -136,7 +136,7 @@ EMULATED-ARCHITECTURES, unless it's empty."
                   (inherit config)
                   (authorized-keys
                    `(("hydra"
-                      ,(local-file 
"../../keys/ssh/hydra.gnu.org.pub")))))))))))
+                      ,(local-file 
"../../keys/ssh/berlin.guixsd.org.pub")))))))))))
 
   (define (childhurd-net-options config)
     "Expose SSH and VNC ports on 0.0.0.0; for first Childhurd VM those
@@ -174,7 +174,7 @@ are 10022 and 15900.  Keep secret-service port local."
                     (full-name "Hydra User")
                     (restricted? #t)
                     (ssh-public-key
-                     (local-file "../../keys/ssh/hydra.gnu.org.pub")))))
+                     (local-file "../../keys/ssh/berlin.guixsd.org.pub")))))
   (operating-system
     (host-name (format #f "hydra-guix-~3,'0d" id))
     (timezone "Europe/Berlin")