Turn off ftp:// on security mirrors

[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 fc19e41..f09a929 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,32 +1,69 @@
 class roles::security_mirror {
+       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,
+       }
+       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
 
        apache2::site { '010-security.debian.org':
                site   => 'security.debian.org',
-               config => 'puppet:///modules/roles/security_mirror/security.debian.org'
+               content => template('roles/security_mirror/security.debian.org.erb')
        }
 
-       $bind = $::hostname ? {
-               default => '',
+       vsftpd::site { 'security':
+               ensure => absent,
+               root   => '/nonexistent',
        }
 
-       $bind6 = $::hostname ? {
-               default => '',
+       rsync::site { 'security':
+               source      => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
+               max_clients => 100,
+               binds       => $binds,
        }
 
-       $logfile = '/var/log/ftp/vsftpd-security.debian.org.log'
-
-       vsftpd::site { 'security':
-               content => template('roles/security_mirror/vsftpd.conf.erb'),
-               logfile => $logfile,
-               bind    => $bind,
+       $onion_v4_addr = $::hostname ? {
+               mirror-anu => '150.203.164.61',
+               mirror-isc => '149.20.4.14',
+               mirror-umn => '128.101.240.215',
+               villa      => '212.211.132.32',
+               lobos      => '212.211.132.250',
+               default   => undef,
        }
+       if has_role('security_mirror_onion') {
+               if ! $onion_v4_addr {
+                       fail("Do not have an onion_v4_addr set for $::hostname.")
+               }
 
-       if $bind6 {
-               vsftpd::site { 'security-v6':
-                       content => template('roles/security_mirror/vsftpd.conf.erb'),
-                       logfile => $logfile,
-                       bind    => $bind6,
+               onion::service { 'security.debian.org':
+                       port => 80,
+                       target_port => 80,
+                       target_address => $onion_v4_addr,
                }
        }
-
 }