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

diff --cc modules/roles/manifests/ftp.pp
index bdb9f4b,7895c66..a7870cb
--- 1/modules/roles/manifests/ftp.pp
--- 2/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 ? {