guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/04: berlin: build-machines: Refer to SSH keys with 'local-file'.


From: Ludovic Courtès
Subject: 03/04: berlin: build-machines: Refer to SSH keys with 'local-file'.
Date: Tue, 19 Nov 2019 06:28:13 -0500 (EST)

civodul pushed a commit to branch master
in repository maintenance.

commit a01f899735dab570fbe3d44a27bc10bfb762a49b
Author: Ludovic Courtès <address@hidden>
Date:   Tue Nov 19 12:17:29 2019 +0100

    berlin: build-machines: Refer to SSH keys with 'local-file'.
    
    * hydra/modules/sysadmin/build-machines.scm (berlin-build-machine-os)
    [hydra-dir, maintenance-file]: Remove.
    [sysadmins]: Use 'local-file' instead.
---
 hydra/modules/sysadmin/build-machines.scm | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/hydra/modules/sysadmin/build-machines.scm 
b/hydra/modules/sysadmin/build-machines.scm
index 5f06aaf..088c1ae 100644
--- a/hydra/modules/sysadmin/build-machines.scm
+++ b/hydra/modules/sysadmin/build-machines.scm
@@ -84,23 +84,19 @@ AUTHORIZED-GUIX-KEYS."
     #~(job '(next-hour '(3 15))
            "guix gc -F 90G"))
 
-  ;; 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")))
+                    (ssh-public-key (local-file "../../keys/ssh/ludo.pub")))
           (sysadmin (name "rekado")
                     (full-name "Ricardo Wurmus")
-                    (ssh-public-key (maintenance-file "keys/ssh/rekado.pub")))
+                    (ssh-public-key (local-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")))))
+                     (local-file "../../keys/ssh/hydra.gnu.org.pub")))))
+
 
   (operating-system
     (host-name (format #f "hydra-guix-~2,'0d" id))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]