Move archvsync_base from FTP to debian_mirror
authorPeter Palfrader <peter@palfrader.org>
Fri, 10 Feb 2017 20:50:55 +0000 (21:50 +0100)
committerPeter Palfrader <peter@palfrader.org>
Fri, 10 Feb 2017 20:50:55 +0000 (21:50 +0100)
modules/roles/manifests/debian_mirror.pp
modules/roles/manifests/ftp.pp

index 81afa72..edf30a1 100644 (file)
@@ -1,4 +1,6 @@
 class roles::debian_mirror {
+       include roles::archvsync_base
+
        $vhost_listen = $::hostname ? {
                klecker    => '130.89.148.12:80 2001:610:1908:b000::148:12:80',
                mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',
index a7870cb..bdb9f4b 100644 (file)
@@ -1,7 +1,6 @@
 class roles::ftp {
        # this is the FTP part of the roles::debian_mirror class
 
-       include roles::archvsync_base
        include ferm::ftp_conntrack
 
        $bind = $::hostname ? {