remove explicit ferm allow from the pgbackup hosts to fasolo

[mirror/dsa-puppet.git] / modules / ferm / manifests / ftp_conntrack.pp

diff --git a/modules/ferm/manifests/ftp_conntrack.pp b/modules/ferm/manifests/ftp_conntrack.pp
index 87e1b0c..ce84e98 100644 (file)
--- a/modules/ferm/manifests/ftp_conntrack.pp
+++ b/modules/ferm/manifests/ftp_conntrack.pp
@@ -1,24 +1,19 @@
 class ferm::ftp_conntrack {
-       # This also works for jessie hosts, but requires a reboot
-       if (versioncmp($::lsbmajdistrelease, '9') >= 0) {
-               # Allow non-passive connections to an FTP server
-               ferm::rule { 'dsa-ftp-conntrack-client':
-                       domain      => '(ip ip6)',
-                       description => 'ftp client connection tracking',
-                       table       => 'raw',
-                       chain       => 'OUTPUT',
-                       rule        => 'proto tcp dport 21 CT helper ftp'
-               }
+  # Allow non-passive connections to an FTP server
+  ferm::rule { 'dsa-ftp-conntrack-client':
+    domain      => '(ip ip6)',
+    description => 'ftp client connection tracking',
+    table       => 'raw',
+    chain       => 'OUTPUT',
+    rule        => 'proto tcp dport 21 CT helper ftp'
+  }
 
-               # Allow passive connections from an FTP client
-               ferm::rule { 'dsa-ftp-conntrack-server':
-                       domain      => '(ip ip6)',
-                       description => 'ftp server connection tracking',
-                       table       => 'raw',
-                       chain       => 'PREROUTING',
-                       rule        => 'proto tcp dport 21 CT helper ftp'
-               }
-       } else {
-               ferm::module { 'nf_conntrack_ftp': }
-       }
+  # Allow passive connections from an FTP client
+  ferm::rule { 'dsa-ftp-conntrack-server':
+    domain      => '(ip ip6)',
+    description => 'ftp server connection tracking',
+    table       => 'raw',
+    chain       => 'PREROUTING',
+    rule        => 'proto tcp dport 21 CT helper ftp'
+  }
 }