01/01: hydra: berlin-build-machine-os: Do not ask for list of sysadmins.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository maintenance.

commit 3e9645280db0af9012eb7f602b150af7f070606c
Author: Ricardo Wurmus <address@hidden>
Date:   Sun Dec 30 08:14:03 2018 +0100

    hydra: berlin-build-machine-os: Do not ask for list of sysadmins.
    
    * hydra/modules/sysadmin/build-machines.scm (berlin-build-machine-os):
    Do not request list of sysadmins.
---
 hydra/modules/sysadmin/build-machines.scm | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/hydra/modules/sysadmin/build-machines.scm 
b/hydra/modules/sysadmin/build-machines.scm
index 0a70456..7b44910 100644
--- a/hydra/modules/sysadmin/build-machines.scm
+++ b/hydra/modules/sysadmin/build-machines.scm
@@ -71,18 +71,35 @@ HOST-NAME and accessibly by SYSADMINS, with the given 
AUTHORIZED-GUIX-KEYS."
                                            (authorized-keys
                                             authorized-guix-keys))))))))
 
-
-(define* (berlin-build-machine-os id sysadmins
+(define* (berlin-build-machine-os id
                                   #:key (authorized-guix-keys '()))
   "Return the <operating-system> declaration for a build machine for
-berlin.guixsd.org with integer ID and accessibly by SYSADMINS, with
-the given AUTHORIZED-GUIX-KEYS."
+berlin.guixsd.org with integer ID, with the given
+AUTHORIZED-GUIX-KEYS."
 
   (define gc-job
     ;; Run 'guix gc' at 3AM every day.
     #~(job '(next-hour '(3))
            "guix gc -F 40G"))
 
+  ;; TODO: this is ugly.
+  (define hydra-dir "/root/maintenance/hydra/")
+  (define (maintenance-file name)
+    (local-file (string-append hydra-dir name)))
+
+  (define sysadmins
+    (list (sysadmin (name "ludo")
+                    (full-name "Ludovic Courtès")
+                    (ssh-public-key (maintenance-file "keys/ssh/ludo.pub")))
+          (sysadmin (name "rekado")
+                    (full-name "Ricardo Wurmus")
+                    (ssh-public-key (maintenance-file "keys/ssh/rekado.pub")))
+          (sysadmin (name "hydra")      ;fake sysadmin
+                    (full-name "Hydra User")
+                    (restricted? #t)
+                    (ssh-public-key
+                     (maintenance-file "keys/ssh/hydra.gnu.org.pub")))))
+
   (operating-system
     (host-name (format #f "hydra-guix-~2,'0d" id))
     (timezone "Europe/Berlin")