From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 10 Jan 2017 20:49:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'waldi/managed-rsyncd-ftp-master'
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=27c2183e590e6eff19e531297422a35fda068f90;p=mirror%2Fdsa-puppet.git

Merge remote-tracking branch 'waldi/managed-rsyncd-ftp-master'

* waldi/managed-rsyncd-ftp-master:
  Use archvsync managed secrets files for rsyncd on ftp-master
---

27c2183e590e6eff19e531297422a35fda068f90