guix
/
maintenance
mirror of git://git.savannah.gnu.org/guix/maintenance.git
2
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2020-10-01 15:49:22 +02:00
parent c123774b8e
commit 263ad44831
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hydra/berlin.scm
View File

@ -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

6
hydra/build-machine.scm
View File

@ -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

4
hydra/modules/sysadmin/build-machines.scm
View File

@ -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")