From 93f0afb42840bceb31d2bcb939ddeadfd6a138f3 Mon Sep 17 00:00:00 2001
From: Christian Heusel <christian@heusel.eu>
Date: Wed, 8 May 2024 14:59:28 +0200
Subject: [PATCH] mirrorsync: Fix the syncarchive setup
related to https://gitlab.archlinux.org/archlinux/infrastructure/-/issues/531
Fixes: c31dd330 ("prepare the split of repo and archive server")
Signed-off-by: Christian Heusel <christian@heusel.eu>
---
group_vars/mirrors/mirrorsync.yml | 2 +-
roles/repo_archive_split_temp/tasks/main.yml | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/group_vars/mirrors/mirrorsync.yml b/group_vars/mirrors/mirrorsync.yml
index 21d18e2ea..90c673923 100644
--- a/group_vars/mirrors/mirrorsync.yml
+++ b/group_vars/mirrors/mirrorsync.yml
@@ -1,7 +1,7 @@
mirrorsync_mirrors:
archive:
hosts: "{{ groups['archive_mirrors'] }}"
- source: rsync://rsync.archlinux.org/archive
+ source: rsync://archive.archlinux.org/archive
target: /srv/archive
last_update_url: https://archive.archlinux.org/repos/last/lastupdate
last_update_dst: lastupdate
diff --git a/roles/repo_archive_split_temp/tasks/main.yml b/roles/repo_archive_split_temp/tasks/main.yml
index 001ee86d6..d629483ea 100644
--- a/roles/repo_archive_split_temp/tasks/main.yml
+++ b/roles/repo_archive_split_temp/tasks/main.yml
@@ -17,6 +17,14 @@
tags:
- nginx
+- name: Put rsyncd.conf into tmpfiles
+ copy: src=rsyncd-tmpfiles.d dest=/etc/tmpfiles.d/rsyncd.conf owner=root group=root mode=0644
+ register: rsyncdtmpfiles
+
+- name: Use tmpfiles.d/rsyncd.conf
+ command: systemd-tmpfiles --create creates=/run/rsyncd
+ when: rsyncdtmpfiles.changed
+
- name: Create rsyncd-conf-genscripts
file: path=/etc/rsyncd-conf-genscripts state=directory owner=root group=root mode=0700
--
GitLab