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

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

* waldi/managed-rsyncd-security-master:
  Use archvsync managed secrets files for rsyncd on security-master
  Drop dead exports rsync module from security-master
---

9c48266c305e43b9dc47da0f4cb1b15a26621796