diff --git a/roles/dbscripts/files/rsyncd-tmpfiles.d b/roles/dbscripts/files/rsyncd-tmpfiles.d deleted file mode 100644 index c4dfeebe38d43a5300a51246b2ce36d3954e6eab..0000000000000000000000000000000000000000 --- 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 fa9d343de3410c17333f3b445af3e7168320990b..07a05135cd18f6e105a87920dc9e00884f7b44fc 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 5ee04c17117830879d6c3d3630c6c18a8723eb0b..2b61d0b7d9547be7105aabf1ec3c6f296ee01cfb 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