Turn off ftp:// on security mirrors

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f9cac90..3e86810 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -139,12 +139,6 @@ roles:
     - mirror-umn.debian.org
     - lobos.debian.org
     - villa.debian.org
-  security_mirror_no_ftp:
-    # hosts that are not part of security.debian.org but
-    # only participiate in the anycast do not need ftp
-    - mirror-accumu.debian.org
-    - mirror-skroutz.debian.org
-    - mirror-bytemark.debian.org
   security_tracker:
     - soriano.debian.org
   security_upload:

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 603c3c7..f09a929 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -36,19 +36,9 @@ class roles::security_mirror {
                content => template('roles/security_mirror/security.debian.org.erb')
        }
 
-       if has_role('security_mirror_no_ftp') {
-               vsftpd::site { 'security':
-                       ensure => absent,
-                       root   => '/nonexistent',
-               }
-       } else {
-               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/',
-                       binds        => $binds,
-               }
+       vsftpd::site { 'security':
+               ensure => absent,
+               root   => '/nonexistent',
        }
 
        rsync::site { 'security':