Merge remote-tracking branch 'waldi/vsftpd-systemd-upload'
authorMartin Zobel-Helas <zobel@debian.org>
Mon, 10 Apr 2017 15:11:09 +0000 (17:11 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Mon, 10 Apr 2017 15:11:09 +0000 (17:11 +0200)
commit5024ebc9b2c219d411e8a1f50fd7767d8004cb6d
tree6a06dbe60732e950b0c82f0e0574ba7c94694abe
parentede01e5e88459e8301e33bbdd7a1d59639c3a624
parent7111c0498546ba9f7022953c4b8bc869f1ca0244
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