fix cuirass system specification

This commit is contained in:
Murphy 2024-12-09 09:16:12 -05:00
parent 2a6a04b6ae
commit a02e288fc8
Signed by: freya
GPG key ID: 9FBC6FFD6D2DBF17

View file

@ -1,11 +1,14 @@
(use-modules (freya system) (use-modules (freya system)
(ice-9 match) (ice-9 match)
(gnu packages ci) (gnu packages ci)
(gnu packages databases)
(gnu services cuirass) (gnu services cuirass)
(gnu services avahi) (gnu services avahi)
(gnu services mcron) (gnu services mcron)
(gnu services web) (gnu services web)
(gnu services databases)
(gnu services networking) (gnu services networking)
(guix gexp)
(gnu)) (gnu))
;; Cuirass specification ;; Cuirass specification
@ -22,9 +25,9 @@
(branch "main") (branch "main")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
"490f9018f0de343c7192c8a2d1f3d9d66f180c8d" "8fb2f9c2fa414754c41c1c73665e3e73e12693ab"
(openpgp-fingerprint (openpgp-fingerprint
"4F6B C11C EBB2 F242 14B9 0FAC 9FF6 937B 829E 565A")))))) "3CD3 65F0 373C EB13 853A F568 9FBC 6FFD 6D2D BF17"))))))
(priority 0) (priority 0)
(systems '("x86_64-linux"))))) (systems '("x86_64-linux")))))
@ -54,36 +57,24 @@
(inherit %virt-freya-operating-system) (inherit %virt-freya-operating-system)
(host-name "cuirass") (host-name "cuirass")
(packages (cons* ; ci (packages (cons* ; ci
cuirass cuirass
%virt-freya-packages)) %virt-freya-packages))
(services (cons* ; avahi (services (cons* ; avahi
(service avahi-service-type) (service avahi-service-type)
; cuirass ; cuirass
(service cuirass-service-type (service cuirass-service-type
(cuirass-configuration (cuirass-configuration
(remote-server
(cuirass-remote-server-configuration
(private-key "/etc/guix/signing-key.sec")
(public-key "/etc/guix/signing-key.pub")
(publish? #f)
(trigger-url "localhost:8080")))
(specifications %cuirass-specs))) (specifications %cuirass-specs)))
; cuirass worker
(service cuirass-remote-worker-service-type
(cuirass-remote-worker-configuration
(private-key "/etc/guix/signing-key.sec")
(public-key "/etc/guix/signing-key.pub")
(server "localhost:5555")
(substitute-urls (list "https://ci.guix.gnu.org"
"https://substitutes.freya.cat"))
(systems '("x86_64-linux"))
(workers 2)))
; guix publish ; guix publish
(service guix-publish-service-type (service guix-publish-service-type
(guix-publish-configuration (guix-publish-configuration
(cache "/var/cache/publish") (cache "/var/cache/publish")
(compression '(("zstd" 19))) (compression '(("zstd" 19)))
(port 8080))) (port 8080)))
; postgresql
(service postgresql-service-type
(postgresql-configuration
(postgresql postgresql-14)))
; cron ; cron
(simple-service 'cron (simple-service 'cron
mcron-service-type mcron-service-type
@ -119,7 +110,8 @@ COMMIT
(nginx-location-configuration (nginx-location-configuration
(uri "/") (uri "/")
(body (body
(list "proxy_pass http://cuirass;")))))) (list "proxy_pass http://cuirass;"
"proxy_set_header X-Forwarded-Proto https;"))))))
(nginx-server-configuration (nginx-server-configuration
(server-name '("substitutes.in.freya.cat")) (server-name '("substitutes.in.freya.cat"))
(listen '("80")) (listen '("80"))