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

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

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

4ca2318f824159566042e9ad02045d8f5f5d2baa