From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 7 Feb 2017 21:13:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'waldi/managed-rsyncd-syncproxy'
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1479fe164bed206f53f9fb5662f0ff7fe43bf37e;p=mirror%2Fdsa-puppet.git

Merge remote-tracking branch 'waldi/managed-rsyncd-syncproxy'

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

1479fe164bed206f53f9fb5662f0ff7fe43bf37e