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

Merge remote-tracking branch 'waldi/vsftpd-systemd-upload'

* waldi/vsftpd-systemd-upload:
  Use vsftpd via systemd on security_master
  Use vsftpd via systemd on ftp_upload
  Make sure xinetd is restarted on service removal
---

5024ebc9b2c219d411e8a1f50fd7767d8004cb6d