From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 10 Feb 2017 20:35:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'waldi/srv-mirrors'
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9fcfecbfcca2dcf3f446d3b6fe989f40143392f4;p=mirror%2Fdsa-puppet.git

Merge remote-tracking branch 'waldi/srv-mirrors'

* waldi/srv-mirrors:
  Setup /srv/mirrors/debian-security on security_mirror
  Setup /srv/mirrors on all (archvsync-based) mirrors

Conflicts:
	modules/roles/manifests/ftp.pp
---

9fcfecbfcca2dcf3f446d3b6fe989f40143392f4
diff --cc modules/roles/manifests/ftp.pp
index bdb9f4b64,7895c6666..a7870cb28
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@@ -1,6 -1,5 +1,7 @@@
  class roles::ftp {
 +	# this is the FTP part of the roles::debian_mirror class
 +
+ 	include roles::archvsync_base
  	include ferm::ftp_conntrack
  
  	$bind = $::hostname ? {