Turn off ftp:// on ftp.debian.org

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
deleted file mode 100644 (file)
index cede542..0000000
--- a/modules/roles/manifests/ftp.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-class roles::ftp {
-       # this is the FTP part of the roles::debian_mirror class
-
-       $binds = $::hostname ? {
-               klecker => [ '130.89.148.12', '[2001:610:1908:b000::148:12]', '[2001:67c:2564:a119::148:12]' ],
-               default => [ '[::]' ],
-       }
-
-       vsftpd::site { 'ftp':
-               banner       => 'ftp.debian.org FTP server',
-               logfile      => '/var/log/ftp/vsftpd-ftp.debian.org.log',
-               binds        => $binds,
-               max_clients  => 200,
-               root         => '/srv/ftp.debian.org/ftp.root',
-       }
-}

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 5f843ac..ffd054b 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -71,7 +71,10 @@ class roles {
                include roles::debian_mirror
        }
        if has_role('ftp.d.o') {
-               include roles::ftp
+               vsftpd::site { 'ftp':
+                       ensure  => absent,
+                       root    => '/nonexistent',
+               }
        }
        if has_role('ftp_master') {
                include roles::ftp_master