diff options
| author | Freya Murphy <freya@freyacat.org> | 2024-12-09 09:16:12 -0500 |
|---|---|---|
| committer | Freya Murphy <freya@freyacat.org> | 2024-12-09 09:16:12 -0500 |
| commit | a02e288fc8b6e45c6e26f97e1d4aaab0e7738710 (patch) | |
| tree | 2f2e964d0bb2042c6aa48261735afea5597c9e71 | |
| parent | update commits, fix hyprland ambiguous, fix `update-commits` script to get ti... (diff) | |
| download | dotfiles-guix-a02e288fc8b6e45c6e26f97e1d4aaab0e7738710.tar.gz dotfiles-guix-a02e288fc8b6e45c6e26f97e1d4aaab0e7738710.tar.bz2 dotfiles-guix-a02e288fc8b6e45c6e26f97e1d4aaab0e7738710.zip | |
fix cuirass system specification
| -rw-r--r-- | systems/cuirass.scm | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/systems/cuirass.scm b/systems/cuirass.scm index 6e7d74e..39cf3a4 100644 --- a/systems/cuirass.scm +++ b/systems/cuirass.scm @@ -1,11 +1,14 @@ (use-modules (freya system) (ice-9 match) (gnu packages ci) + (gnu packages databases) (gnu services cuirass) (gnu services avahi) (gnu services mcron) (gnu services web) + (gnu services databases) (gnu services networking) + (guix gexp) (gnu)) ;; Cuirass specification @@ -22,9 +25,9 @@ (branch "main") (introduction (make-channel-introduction - "490f9018f0de343c7192c8a2d1f3d9d66f180c8d" + "8fb2f9c2fa414754c41c1c73665e3e73e12693ab" (openpgp-fingerprint - "4F6B C11C EBB2 F242 14B9 0FAC 9FF6 937B 829E 565A")))))) + "3CD3 65F0 373C EB13 853A F568 9FBC 6FFD 6D2D BF17")))))) (priority 0) (systems '("x86_64-linux"))))) @@ -54,36 +57,24 @@ (inherit %virt-freya-operating-system) (host-name "cuirass") (packages (cons* ; ci - cuirass + cuirass %virt-freya-packages)) (services (cons* ; avahi - (service avahi-service-type) + (service avahi-service-type) ; cuirass (service cuirass-service-type (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))) - ; 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 (service guix-publish-service-type (guix-publish-configuration (cache "/var/cache/publish") (compression '(("zstd" 19))) (port 8080))) + ; postgresql + (service postgresql-service-type + (postgresql-configuration + (postgresql postgresql-14))) ; cron (simple-service 'cron mcron-service-type @@ -119,7 +110,8 @@ COMMIT (nginx-location-configuration (uri "/") (body - (list "proxy_pass http://cuirass;")))))) + (list "proxy_pass http://cuirass;" + "proxy_set_header X-Forwarded-Proto https;")))))) (nginx-server-configuration (server-name '("substitutes.in.freya.cat")) (listen '("80")) |