From: Bastian Blank <waldi@debian.org>
Date: Fri, 31 Mar 2017 09:27:09 +0000 (+0200)
Subject: Disable ftp in security_mirror role
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5a0da8586fc1784f755f36ab557d038fb922d2bb;p=mirror%2Fdsa-puppet.git

Disable ftp in security_mirror role

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index d135ffe41..c6019a868 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -38,7 +38,9 @@ class roles::security_mirror {
 	}
 
 	if has_role('security_mirror_no_ftp') {
-	 # nop
+		vsftpd::site { [ 'security', 'security6' ]:
+			ensure => absent,
+		}
 	} else {
 		include ferm::ftp_conntrack
 		vsftpd::site { 'security':