From 6853b65dc06f4d7908f1c2cc3df047daa0d12824 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 13 Aug 2023 15:31:17 -0400
Subject: [PATCH] services/nomad/build/buildsync-{aarch64,musl}.nomad: use
 rsyncd

instead of a cron job, use rwc to trigger rsync jobs. This should also
push to the glibc builder now, instead of the glibc builder pulling from
the other builders
---
 services/nomad/build/buildsync-aarch64.nomad | 30 ++++----------------
 services/nomad/build/buildsync-musl.nomad    | 30 ++++----------------
 services/nomad/build/buildsync-watch         |  8 ++++++
 services/pkg/rsync/Dockerfile                |  2 +-
 4 files changed, 19 insertions(+), 51 deletions(-)
 create mode 100644 services/nomad/build/buildsync-watch

diff --git a/services/nomad/build/buildsync-aarch64.nomad b/services/nomad/build/buildsync-aarch64.nomad
index d5a3a6f3..f4783057 100644
--- a/services/nomad/build/buildsync-aarch64.nomad
+++ b/services/nomad/build/buildsync-aarch64.nomad
@@ -13,20 +13,11 @@ job "buildsync-aarch64" {
     }
 
     task "rsync" {
-      leader = true
       driver = "docker"
 
-      vault {
-        policies = ["void-secrets-buildsync"]
-      }
-
       config {
-        image = "eeacms/rsync"
-        args = ["client"]
-      }
-
-      env {
-        CRON_TASK_1="*/5 * * * * flock -n /run/rsync.lock rsync -vurk -e 'ssh -i /secrets/id_rsa -o UserKnownHostsFile=/local/known_hosts' --exclude '*.sig' --delete-after -f '+ */' -f '+ aarch64*-repodata' -f '+ *.aarch64*.xbps' -f '+ *.noarch*.xbps' -f '+ otime' -f '- *' void-buildsync@b-fsn-de.node.consul:/hostdir/binpkgs/ /pkgs/aarch64"
+        image = "ghcr.io/void-linux/infra-rsync:202308" # TODO
+        args = ["/local/buildsync-watch", "aarch64"]
       }
 
       volume_mount {
@@ -35,20 +26,9 @@ job "buildsync-aarch64" {
       }
 
       template {
-        data = <<EOF
-{{- with secret "secret/buildsync/ssh" -}}
-{{.Data.private_key}}
-{{- end -}}
-EOF
-        destination = "secrets/id_rsa"
-        perms = "0400"
-      }
-
-      template {
-        data = <<EOF
-b-fsn-de.node.consul ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP1ykMRsB3/DOv/NhnhajQIB99xUdM7RauBS5ptj2i4q
-EOF
-        destination = "local/known_hosts"
+        data = file("buildsync-watch")
+        destination = "local/buildsync-watch"
+        perms = "0755"
       }
     }
   }
diff --git a/services/nomad/build/buildsync-musl.nomad b/services/nomad/build/buildsync-musl.nomad
index 25485415..b3b164e8 100644
--- a/services/nomad/build/buildsync-musl.nomad
+++ b/services/nomad/build/buildsync-musl.nomad
@@ -13,20 +13,11 @@ job "buildsync-musl" {
     }
 
     task "rsync" {
-      leader = true
       driver = "docker"
 
-      vault {
-        policies = ["void-secrets-buildsync"]
-      }
-
       config {
-        image = "eeacms/rsync"
-        args = ["client"]
-      }
-
-      env {
-        CRON_TASK_1="*/5 * * * * flock -n /run/rsync.lock rsync -vurk -e 'ssh -i /secrets/id_rsa -o UserKnownHostsFile=/local/known_hosts' --exclude '*.sig' --delete-after -f '+ */' -f '+ *-repodata' -f '+ *.xbps' -f '+ otime' -f '- *' void-buildsync@a-hel-fi.node.consul:/hostdir/binpkgs/ /pkgs/musl/"
+        image = "ghcr.io/void-linux/infra-rsync:202308" # TODO
+        args = ["/local/buildsync-watch", "musl"]
       }
 
       volume_mount {
@@ -35,20 +26,9 @@ job "buildsync-musl" {
       }
 
       template {
-        data = <<EOF
-{{- with secret "secret/buildsync/ssh" -}}
-{{.Data.private_key}}
-{{- end -}}
-EOF
-        destination = "secrets/id_rsa"
-        perms = "0400"
-      }
-
-      template {
-        data = <<EOF
-a-hel-fi.node.consul ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIW8voCZh9nQpdx3fAsvfZO4mCYv0/OUVNPF9A/GsHtX
-EOF
-        destination = "local/known_hosts"
+        data = file("buildsync-watch")
+        destination = "local/buildsync-watch"
+        perms = "0755"
       }
     }
   }
diff --git a/services/nomad/build/buildsync-watch b/services/nomad/build/buildsync-watch
new file mode 100644
index 00000000..1668d722
--- /dev/null
+++ b/services/nomad/build/buildsync-watch
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+BUILDER="$1"
+
+rwc "/pkgs/$BUILDER" "/pkgs/$BUILDER/bootstrap" "/pkgs/$BUILDER/nonfree" "/pkgs/$BUILDER/debug" | \
+xe -s 'flock -n /run/rsync.lock rsync -vurk
+ --delete-after -f "+ */" -f "+ *-repodata" -f "+ *.xbps" -f "+ otime" -f "- *"
+ /pkgs/'"$BUILDER"'/ void-buildsync@a-fsn-de.node.consul::/pkgs/'"$BUILDER"
diff --git a/services/pkg/rsync/Dockerfile b/services/pkg/rsync/Dockerfile
index 362d8b0b..35644c16 100644
--- a/services/pkg/rsync/Dockerfile
+++ b/services/pkg/rsync/Dockerfile
@@ -1,6 +1,6 @@
 FROM  ghcr.io/void-linux/void-glibc:latest
 
-RUN xbps-install -Sy rsync tini snooze && \
+RUN xbps-install -Sy rsync tini snooze rwc xe util-linux findutils && \
         mkdir -p /etc/rsyncd.conf.d/ && \
         rm -rf /var/cache/xbps