From: Martin Zobel-Helas <zobel@debian.org>
Date: Tue, 11 Apr 2017 10:51:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'waldi/rsyncd-vsftpd-systemd-all'
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=08d03e5feeda48ea91899723368e88e24a9b4708;p=mirror%2Fdsa-puppet.git

Merge remote-tracking branch 'waldi/rsyncd-vsftpd-systemd-all'

* waldi/rsyncd-vsftpd-systemd-all:
  Another try to fix xinetd vs. systemd
  Pull in ftp conntrack in vsftpd site
  Use rsyncd via systemd on bugs_mirror
  Use rsyncd via systemd on wiki
  Use rsyncd via systemd on snapshot
  Use vsftpd via systemd on ftp
  Use rsyncd via systemd on syncproxy
  Use rsyncd and vsftpd via systemd on security_mirror
  Fix dependencies between service and xinetd
---

08d03e5feeda48ea91899723368e88e24a9b4708