diff options
| -rw-r--r-- | .guix/guix-na/config/balg02.scm | 32 | ||||
| -rw-r--r-- | channels.scm | 4 | ||||
| -rw-r--r-- | docs/administration.org | 6 |
3 files changed, 33 insertions, 9 deletions
diff --git a/.guix/guix-na/config/balg02.scm b/.guix/guix-na/config/balg02.scm index 88f5634..492c834 100644 --- a/.guix/guix-na/config/balg02.scm +++ b/.guix/guix-na/config/balg02.scm @@ -21,16 +21,19 @@ #:use-module (gnu) #:use-module (gnu system) #:use-module (gnu packages bash) + #:use-module (gnu packages databases) #:use-module (gnu packages shells) #:use-module (gnu packages web) #:use-module (gnu services base) #:use-module (gnu services cuirass) #:use-module (gnu services certbot) + #:use-module (gnu services databases) #:use-module (gnu services networking) #:use-module (gnu services ssh) #:use-module (gnu services web) #:export (balg02 %system)) + (define %cuirass-specs #~(list (specification (name "guix") @@ -473,7 +476,7 @@ synonymous IETF language tags that should be mapped to the same $lang." "--gc-keep-derivations")) (tmpdir "/var/tmp"))) -(define (balg02 efi-boot-uuid) +(define* (balg02 #:key efi-boot-uuid raid1-data-uuid data-raid-members) (operating-system (host-name "balg02") (timezone "US/Central") @@ -494,6 +497,13 @@ synonymous IETF language tags that should be mapped to the same $lang." (serial-speed 115200) (targets '("/boot/efi")))) + (mapped-devices + (list + (mapped-device + (source data-raid-members) + (target "/dev/md0") + (type raid-device-mapping)))) + (file-systems (append (list (file-system (device (file-system-label "root")) @@ -513,7 +523,13 @@ synonymous IETF language tags that should be mapped to the same $lang." (device "none") (mount-point "/tmp") (type "tmpfs") - (check? #f))) + (check? #f)) + (file-system + (device (uuid raid1-data-uuid)) + (mount-point "/var/data") + (create-mount-point? #t) + (type "ext4") + (dependencies mapped-devices))) %base-file-systems)) (swap-devices @@ -560,6 +576,7 @@ synonymous IETF language tags that should be mapped to the same $lang." (append (map specification->package '("btrfs-progs" + "mdadm" "recutils" "openssh" "tmux" @@ -608,6 +625,9 @@ synonymous IETF language tags that should be mapped to the same $lang." (domains '("cuirass.genenetwork.org")) (deploy-hook %nginx-deploy-hook)))))) + (service postgresql-service-type + (postgresql-configuration + (postgresql postgresql-14))) (service cuirass-service-type (cuirass-configuration (host "localhost") @@ -619,7 +639,8 @@ synonymous IETF language tags that should be mapped to the same $lang." (service guix-publish-service-type (guix-publish-configuration (port 3000) - (cache "/var/cache/guix/publish")))) + (cache "/var/data/guix-publish-cache/") + (ttl (* 90 24 3600))))) (modify-services %base-services (guix-service-type config => (guix-daemon-config #:substitute-urls @@ -632,4 +653,7 @@ synonymous IETF language tags that should be mapped to the same $lang." %default-authorized-guix-keys) #:build-accounts-to-max-jobs-ratio 5))))))) -(define %system (balg02 "3AF8-9E67")) +(define %system (balg02 + #:efi-boot-uuid "3AF8-9E67" + #:raid1-data-uuid "fdc495ca-6ac6-4a50-9115-8f5e2cc2851f" + #:data-raid-members (list "/dev/sdc1" "/dev/sdd1"))) diff --git a/channels.scm b/channels.scm index 5cfbb85..5edde8e 100644 --- a/channels.scm +++ b/channels.scm @@ -1,9 +1,9 @@ (list (channel (name 'guix) - (url "https://git.savannah.gnu.org/git/guix.git") + (url "https://codeberg.org/guix/guix.git") (branch "master") (commit - "269e4034fcaf55324187efffb6ed5ba14d5e9286") + "0edbe5d44bf196569ab2bedf6f085e91d69abfd1") (introduction (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad" diff --git a/docs/administration.org b/docs/administration.org index 8dd2b82..54eadf1 100644 --- a/docs/administration.org +++ b/docs/administration.org @@ -10,19 +10,19 @@ This document details maintenance and administration of cuirass.genenetwork.org. 1. Fetch the most recent channel file. #+begin_src shell - curl -O https://git.genenetwork.org/guix-north-america/plain/channels.scm + guix shell curl -- curl -O https://git.genenetwork.org/guix-north-america/plain/channels.scm #+end_src 2. Update guix using the most recent channel file. #+begin_src shell - sudo -i guix pull -C $(relapath channels.scm) + sudo -i guix pull -C $(realpath channels.scm) #+end_src 3. Update the system. #+begin_src shell - sudo guix system reconfigure -e '((@ (guix-na config balg02) balg02) %system)' + sudo guix system reconfigure -e '(@ (guix-na config balg02) %system)' #+end_src 4. Reboot. |