branch master updated: hydra: node-129: Add an rsync service for substitutes mirroring.

[Maxim Cournoyer]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new b49da23  hydra: node-129: Add an rsync service for substitutes 
mirroring.
b49da23 is described below

commit b49da23ee62589359f1e005f22e77a6065172d3d
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri May 19 09:12:11 2023 -0400

    hydra: node-129: Add an rsync service for substitutes mirroring.
    
    * hydra/deploy-node-129.scm (node-129-os) [file-systems]: Move
    @publish-mirror subvolume to SAN storage.
    [services]: Add an rsync service.
---
 hydra/deploy-node-129.scm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/hydra/deploy-node-129.scm b/hydra/deploy-node-129.scm
index e1e058e..b17e53f 100644
--- a/hydra/deploy-node-129.scm
+++ b/hydra/deploy-node-129.scm
@@ -7,12 +7,15 @@
 ;;;
 ;;; 2. be available as a fall-back to Berlin in case of problems
 ;;;
-;;; 3. Be used as a test bed for staging new configurations before
+;;; 3. offer an rsync service to mirror Berlin's binary substitutes
+;;;
+;;; 4. Be used as a test bed for staging new configurations before
 ;;;    they are deployed in production to Berlin.
 ;;;
 ;;; TODO: Implement service redundancy with Berlin.
 ;;;
 ;;; FIXME: Re-deploying must happen from Berlin, due to bug #46760.
+;;; FIXME: Must use reconfigure instead of deploy due to bug #63559.
 ;;;
 ;;; To update its operating system, make sure you are a sysadmin
 ;;; defined in the 'berlin-new-build-machine-os' procedure in
@@ -29,6 +32,7 @@
              (gnu packages linux)
              (gnu services base)
              (gnu services mcron)
+             (gnu services rsync)
              (gnu services ssh)
              (gnu system file-systems)
             (gnu system linux-initrd)
@@ -199,8 +203,7 @@ devices {
                      ;; point itself, so introduce a 'publish' parent
                      ;; directory.
                      (btrfs-subvolume-mount "@publish-mirror"
-                                            "/srv/publish/substitutes"
-                                            #:device-uuid %btrfs-ssd-uuid)
+                                            "/srv/publish/substitutes")
                      %base-file-systems))
       (services
        (cons* (simple-service 'copy-kernel+initrd-to-/boot
@@ -209,6 +212,12 @@ devices {
              (simple-service 'etc-multipath.conf
                               etc-service-type
                               (list `("multipath.conf" ,%multipath.conf)))
+              (service rsync-service-type
+                       (rsync-configuration
+                        (modules
+                         (list (rsync-module
+                                (name "substitutes")
+                                (file-name "/srv/publish/substitutes"))))))
               (modify-services (operating-system-user-services base-os)
                 (mcron-service-type
                  config => (mcron-configuration