Pull in ftp conntrack in vsftpd site

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 712a597..9c6e802 100644 (file)
--- 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 7b80fb8..c3f5cbc 100644 (file)
--- 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 f7fe2b8..3a51f69 100644 (file)
--- 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 3e81807..92cd626 100644 (file)
--- 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 ced51d4..4825897 100644 (file)
--- 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: {}