From 0aa086d9cbd14ffa4946355a64a257f9069c2bc4 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Wed, 1 Nov 2017 14:45:33 +0100
Subject: [PATCH] Turn off ftp:// on ftp.debian.org

---
 modules/roles/manifests/ftp.pp  | 16 ----------------
 modules/roles/manifests/init.pp |  5 ++++-
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 modules/roles/manifests/ftp.pp

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
deleted file mode 100644
index cede5429b..000000000
--- 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 5f843acfd..ffd054b80 100644
--- 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
-- 
2.20.1