From 7fdcc76928ca846ab6f8c74a1a446d116944a6f1 Mon Sep 17 00:00:00 2001
From: Kristian Klausen <kristian@klausen.dk>
Date: Sat, 8 Jun 2024 20:22:37 +0200
Subject: [PATCH] Revert "dbscripts: Add tmpfiles.d/rsyncd.conf for abs and
 friends"

It is unclear why this was added, as we can just use the default lock
file path (/var/run/rsyncd.lock). Using a non-default path was not added
in the offending commit, but remove it in this revert commit
nevertheless, so the commit can be reverted.

This reverts commit e4e07516a3c78da22a0984b35cbc86f00836bfe9.
---
 roles/dbscripts/files/rsyncd-tmpfiles.d        | 1 -
 roles/dbscripts/tasks/main.yml                 | 8 --------
 roles/dbscripts/templates/rsyncd.conf.proto.j2 | 1 -
 3 files changed, 10 deletions(-)
 delete mode 100644 roles/dbscripts/files/rsyncd-tmpfiles.d

diff --git a/roles/dbscripts/files/rsyncd-tmpfiles.d b/roles/dbscripts/files/rsyncd-tmpfiles.d
deleted file mode 100644
index c4dfeebe3..000000000
--- a/roles/dbscripts/files/rsyncd-tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-D /run/rsyncd 0700 nobody nobody -
diff --git a/roles/dbscripts/tasks/main.yml b/roles/dbscripts/tasks/main.yml
index fa9d343de..07a05135c 100644
--- a/roles/dbscripts/tasks/main.yml
+++ b/roles/dbscripts/tasks/main.yml
@@ -210,14 +210,6 @@
 - name: Make /srv/ftp/other/packages available
   file: path=/srv/ftp/other/packages state=directory owner=root group=junior-dev mode=0775
 
-- 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
 
diff --git a/roles/dbscripts/templates/rsyncd.conf.proto.j2 b/roles/dbscripts/templates/rsyncd.conf.proto.j2
index 5ee04c171..2b61d0b7d 100644
--- a/roles/dbscripts/templates/rsyncd.conf.proto.j2
+++ b/roles/dbscripts/templates/rsyncd.conf.proto.j2
@@ -4,7 +4,6 @@
 
 use chroot = no
 max connections = 12
-lock file = /var/run/rsyncd/main.lock
 syslog facility = local5
 pid file = /var/run/rsyncd.pid
 #transfer logging = yes
-- 
GitLab