From 3f9e9f783ec9d749992116818ef4bd9253f9a955 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Fri, 31 Mar 2017 18:53:27 +0200
Subject: [PATCH] Pull in ftp conntrack in vsftpd site

---
 modules/roles/manifests/ftp.pp             | 2 --
 modules/roles/manifests/ftp_upload.pp      | 3 ---
 modules/roles/manifests/ports_master.pp    | 2 --
 modules/roles/manifests/security_mirror.pp | 1 -
 modules/vsftpd/manifests/site_systemd.pp   | 1 +
 5 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 712a597d9..9c6e802d3 100644
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,8 +1,6 @@
 class roles::ftp {
 	# this is the FTP part of the roles::debian_mirror class
 
-	include ferm::ftp_conntrack
-
 	$binds = $::hostname ? {
 		klecker => [ '130.89.148.12', '[2001:610:1908:b000::148:12]' ],
 		default => [ '[::]' ],
diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 7b80fb8af..c3f5cbc11 100644
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,7 +1,4 @@
 class roles::ftp_upload {
-
-	include ferm::ftp_conntrack
-
 	vsftpd::site_systemd { 'ftp-upload':
 		banner     => 'ftp.upload.debian.org FTP server',
 		logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
diff --git a/modules/roles/manifests/ports_master.pp b/modules/roles/manifests/ports_master.pp
index f7fe2b80e..3a51f698f 100644
--- a/modules/roles/manifests/ports_master.pp
+++ b/modules/roles/manifests/ports_master.pp
@@ -9,8 +9,6 @@ class roles::ports_master {
 		key => true,
 	}
 
-	include ferm::ftp_conntrack
-
 	vsftpd::site_systemd { 'ports-master':
 		banner         => 'ports-master.debian.org FTP server',
 		logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',
diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 3e818074b..92cd6263e 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -42,7 +42,6 @@ class roles::security_mirror {
 			root   => '/nonexistent',
 		}
 	} else {
-		include ferm::ftp_conntrack
 		vsftpd::site_systemd { 'security':
 			banner       => 'security.debian.org FTP server (vsftpd)',
 			logfile      => '/var/log/ftp/vsftpd-security.debian.org.log',
diff --git a/modules/vsftpd/manifests/site_systemd.pp b/modules/vsftpd/manifests/site_systemd.pp
index ced51d49f..482589787 100644
--- a/modules/vsftpd/manifests/site_systemd.pp
+++ b/modules/vsftpd/manifests/site_systemd.pp
@@ -10,6 +10,7 @@ define vsftpd::site_systemd (
 	$ensure=present,
 ) {
 	include vsftpd
+	include ferm::ftp_conntrack
 
 	case $ensure {
 		present,absent: {}
-- 
2.20.1