Pull out listen addresses from hiera again

[mirror/dsa-puppet.git] / modules / roles / manifests / security_mirror.pp

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 986b5ae..472a145 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,42 +1,69 @@
 class roles::security_mirror {
-       $rsync_bind = $::hostname ? {
-               mirror-anu => '150.203.164.61',
-               mirror-isc => '149.20.20.19',
-               mirror-umn => '128.101.240.215',
-               default    => '',
+       include roles::archvsync_base
+
+       $binds = $::hostname ? {
+               mirror-anu      => [ '150.203.164.61', '[2001:388:1034:2900::3d]' ],
+               mirror-bytemark => [ '5.153.231.46', '[2001:41c8:1000:21::21:46]' ],
+               mirror-conova   => [ '217.196.149.233', '[2a02:16a8:dc41:100::233]' ],
+               mirror-isc      => [ '149.20.4.14', '[2001:4f8:1:c::14]' ],
+               mirror-umn      => [ '128.101.240.215', '[2607:ea00:101:3c0b::1deb:215]' ],
+               default         => [ '[::]' ],
+       }
+
+       file { '/srv/mirrors/debian-security':
+               ensure => link,
+               target => '../ftp.root/debian-security',
+       }
+       file { '/srv/ftp.root':
+               ensure  => directory,
        }
-       $rsync_bind6 = $::hostname ? {
-               mirror-anu => '2001:388:1034:2900::3d',
-               mirror-isc => '2001:4f8:8:36::1deb:19',
-               mirror-umn => '2607:ea00:101:3c0b::1deb:215',
-               default    => '',
+       file { '/srv/ftp.root/.nobackup':
+               ensure  => present,
+               content => '',
        }
+       file { '/srv/ftp.root/debian-security':
+               ensure => directory,
+               owner  => 1176, # archvsync
+               group  => 1176, # archvsync
+               mode   => '0755',
+       }
+
+       include apache2::expires
+       include apache2::rewrite
 
-       include apache2::cache
        apache2::site { '010-security.debian.org':
                site   => 'security.debian.org',
                content => template('roles/security_mirror/security.debian.org.erb')
        }
 
-       include ferm::ftp_conntrack
+        # roles is a list of hashes, which needs to be unpacked into a regular hash
+        $mirrors = hiera('roles.security_mirror', [])
+        # unpack $mirrors and construct a hash
+        $m2 = Hash($mirrors.map |$h| { $h.map |$k, $v| { [$k, $v] }[0]})
+        $fastly_mirrors = $m2.filter |$h| { $h[1]['fastly-backend'] }
+        $hosts_to_check = $fastly_mirrors.map |$h| { $h[1]['service-hostname'] }
+
+        roles::mirror_health { 'security':
+               check_hosts   => $hosts_to_check,
+               check_service => 'security',
+               url           => 'http://security.backend.mirrors.debian.org/debian/dists/sid/Release',
+               health_url    => 'http://security.backend.mirrors.debian.org/_health',
+        }
+
        vsftpd::site { 'security':
-               banner       => 'security.debian.org FTP server (vsftpd)',
-               logfile      => '/var/log/ftp/vsftpd-security.debian.org.log',
-               max_clients  => 200,
-               root         => '/srv/ftp.root/',
+               ensure => absent,
+               root   => '/nonexistent',
        }
 
        rsync::site { 'security':
                source      => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
                max_clients => 100,
-               bind        => $rsync_bind,
-               bind6       => $rsync_bind6,
+               binds       => $binds,
        }
 
-
        $onion_v4_addr = $::hostname ? {
                mirror-anu => '150.203.164.61',
-               mirror-isc => '149.20.20.19',
+               mirror-isc => '149.20.4.14',
                mirror-umn => '128.101.240.215',
                villa      => '212.211.132.32',
                lobos      => '212.211.132.250',