X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fftp_conntrack.pp;h=ce84e98a33ac168d057a5ec530ca3266ef22d87d;hb=015fa6b401098df522b1adf8e574a88d581ef340;hp=45e060b62f42a975397f74987acc8b89301bdb1d;hpb=15811369946e05646a4743712dd8a58a3bd37038;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/ftp_conntrack.pp b/modules/ferm/manifests/ftp_conntrack.pp
index 45e060b62..ce84e98a3 100644
--- 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'
+  }
 }