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

hydra: Move overdrive to sysadmin. 

* hydra/overdrive.scm: Move it to ...
* hydra/modules/sysadmin/overdrive.scm: ... here.
* hydra/overdrive1.scm: Adapt it.
This commit is contained in:
Mathieu Othacehe 2021-02-17 11:49:19 +01:00
parent 901d88dfae
commit 7ba86359aa
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
2 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
hydra/overdrive.scm → hydra/modules/sysadmin/overdrive.scm
View File

@ -16,7 +16,7 @@
;;; You should have received a copy of the GNU General Public License
;;; along with this program. If not, see <http://www.gnu.org/licenses/>.
(define-module (overdrive)
(define-module (sysadmin overdrive)
#:use-module (gnu)
#:use-module (gnu packages screen)
#:use-module (gnu packages ssh)
@ -52,11 +52,11 @@
(define %authorized-guix-keys
;; List of authorized 'guix archive' keys.
(list (local-file "keys/guix/berlin.guixsd.org-export.pub")
(list (local-file "../../keys/guix/berlin.guixsd.org-export.pub")
;; Exceptionally, allow exports from Ludo's laptop. This is
;; necessary for the release process.
(local-file "keys/guix/ludo-laptop-export.pub")))
(local-file "../../keys/guix/ludo-laptop-export.pub")))
(define gc-job
;; Run 'guix gc' at 3AM every day.
@ -105,48 +105,49 @@
(users (append %accounts %base-user-accounts))
(services
(cons* (service openssh-service-type
(openssh-configuration
(authorized-keys
`(("ludo" ,(local-file "keys/ssh/ludo.pub"))
("rekado" ,(local-file "keys/ssh/rekado.pub"))
("dannym" ,(local-file "keys/ssh/dannym.pub"))
("janneke" ,(local-file "keys/ssh/janneke.pub"))
("mathieu" ,(local-file "keys/ssh/mathieu.pub"))))))
(service avahi-service-type)
(service dhcp-client-service-type)
(service mcron-service-type
(mcron-configuration
(jobs (list gc-job btrfs-job))))
(cons*
(service openssh-service-type
(openssh-configuration
(authorized-keys
`(("ludo" ,(local-file "../../keys/ssh/ludo.pub"))
("rekado" ,(local-file "../../keys/ssh/rekado.pub"))
("dannym" ,(local-file "../../keys/ssh/dannym.pub"))
("janneke" ,(local-file "../../keys/ssh/janneke.pub"))
("mathieu" ,(local-file "../../keys/ssh/mathieu.pub"))))))
(service avahi-service-type)
(service dhcp-client-service-type)
(service mcron-service-type
(mcron-configuration
(jobs (list gc-job btrfs-job))))
(service agetty-service-type
(agetty-configuration
(tty "ttyAMA0")
(keep-baud? #t)
(term "vt220")
(baud-rate "115200,38400,9600")))
(service cuirass-remote-worker-service-type
(cuirass-remote-worker-configuration
(workers 2)
(server "10.0.0.1:5555") ;berlin
(systems '("armhf-linux" "aarch64-linux"))))
(service wireguard-service-type
(wireguard-configuration
(addresses (list wireguard-ip))
(peers
(list berlin-peer))))
(service agetty-service-type
(agetty-configuration
(tty "ttyAMA0")
(keep-baud? #t)
(term "vt220")
(baud-rate "115200,38400,9600")))
(service cuirass-remote-worker-service-type
(cuirass-remote-worker-configuration
(workers 2)
(server "10.0.0.1:5555") ;berlin
(systems '("armhf-linux" "aarch64-linux"))))
(service wireguard-service-type
(wireguard-configuration
(addresses (list wireguard-ip))
(peers
(list berlin-peer))))
(service ntp-service-type)
(service ntp-service-type)
(modify-services %base-services
(guix-service-type config =>
(guix-configuration
(inherit config)
(max-silent-time 7200)
(authorized-keys
%authorized-guix-keys)
(extra-options
'("--max-jobs=2" "--cores=3")))))))
(modify-services %base-services
(guix-service-type config =>
(guix-configuration
(inherit config)
(max-silent-time 7200)
(authorized-keys
%authorized-guix-keys)
(extra-options
'("--max-jobs=2" "--cores=3")))))))
(packages (cons* btrfs-progs screen openssh strace nss-certs
%base-packages))))

2
hydra/overdrive1.scm
View File

@ -1,4 +1,4 @@
(use-modules (overdrive))
(use-modules (sysadmin overdrive))
(overdrive-system "overdrive1"
#:wireguard-ip "10.0.0.3/32")