From: Julien Cristau <jcristau@debian.org>
Date: Wed, 1 Nov 2017 13:54:58 +0000 (+0100)
Subject: Disable ftp:// on security-master
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=0b799e9c561dfa303695372e1b2037b12ef0c274;p=mirror%2Fdsa-puppet.git

Disable ftp:// on security-master
---

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index 6b463a52d..a7f851611 100644
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -6,11 +6,8 @@ class roles::security_master {
 	}
 
 	vsftpd::site { 'security':
-		banner     => 'security-master.debian.org FTP server (vsftpd)',
-		logfile    => '/var/log/ftp/vsftpd-security-master.debian.org.log',
-		writable   => true,
-		chown_user => dak-unpriv,
-		root       => '/srv/ftp.root/',
+		ensure	=> absent,
+		root	=> '/nonexistent',
 	}
 
 	rsync::site { 'security_master':