Do not use sslname empty string for no ssl

[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 a2d5aee..d135ffe 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -3,29 +3,31 @@ class roles::security_mirror {
 
        $rsync_bind = $::hostname ? {
                mirror-anu => '150.203.164.61',
+               mirror-bytemark => '5.153.231.46',
+               mirror-conova => '217.196.149.233',
                mirror-isc => '149.20.4.14',
                mirror-umn => '128.101.240.215',
                default    => '',
        }
        $rsync_bind6 = $::hostname ? {
                mirror-anu => '2001:388:1034:2900::3d',
+               mirror-bytemark => '2001:41c8:1000:21::21:46',
+               mirror-conova => '2a02:16a8:dc41:100::233',
                mirror-isc => '2001:4f8:1:c::14',
                mirror-umn => '2607:ea00:101:3c0b::1deb:215',
                default    => '',
        }
-       $ftp_bind = $::hostname ? {
-               mirror-anu => '150.203.164.61',
-               default => '',
-       }
-       $ftp_bind6 = $::hostname ? {
-               mirror-anu => '2001:388:1034:2900::3d',
-               default => undef,
-       }
+       $ftp_bind = $rsync_bind
+       $ftp_bind6 = $rsync_bind6
 
        file { '/srv/mirrors/debian-security':
                ensure => link,
                target => '../ftp.root/debian-security',
        }
+       file { '/srv/ftp.root/.nobackup':
+               ensure  => present,
+               content => '',
+       }
 
        include apache2::expires
        include apache2::rewrite
@@ -35,21 +37,25 @@ class roles::security_mirror {
                content => template('roles/security_mirror/security.debian.org.erb')
        }
 
-       include ferm::ftp_conntrack
-       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/',
-               bind         => $ftp_bind,
-       }
-       if ($ftp_bind6) {
-               vsftpd::site { 'security6':
+       if has_role('security_mirror_no_ftp') {
+        # nop
+       } else {
+               include ferm::ftp_conntrack
+               vsftpd::site { 'security':
                        banner       => 'security.debian.org FTP server (vsftpd)',
-                       logfile      => '/var/log/ftp/vsftpd-security6.debian.org.log',
+                       logfile      => '/var/log/ftp/vsftpd-security.debian.org.log',
                        max_clients  => 200,
                        root         => '/srv/ftp.root/',
-                       bind         => $ftp_bind6,
+                       bind         => $ftp_bind,
+               }
+               if ($ftp_bind6 != '') {
+                       vsftpd::site { 'security6':
+                               banner       => 'security.debian.org FTP server (vsftpd)',
+                               logfile      => '/var/log/ftp/vsftpd-security6.debian.org.log',
+                               max_clients  => 200,
+                               root         => '/srv/ftp.root/',
+                               bind         => $ftp_bind6,
+                       }
                }
        }