X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=5f175260aeb625685ab31e35afa8e9067af812d6;hb=47b37f6a9bbb69e5d90ea7e44237618c14b90608;hp=65b056d872b293407dd351fc6754e0e1f9e56c89;hpb=1eed6c206bf73140deaa4d931f6b54d528636e8d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 65b056d87..5f175260a 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -3,10 +3,6 @@ class ferm::per-host {
 		include ferm::zivit
 	}
 
-	if $::hostname in [chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,ries,rietz,saens,schein,santoro,steffani,valente,villa,wieck,stabile,bizet] {
-		include ferm::ftp
-	}
-
 	case $::hostname {
 		piatti,samosa: {
 			@ferm::rule { 'dsa-udd-stunnel':
@@ -91,13 +87,6 @@ class ferm::per-host {
 				rule            => '&SERVICE(tcp, 6523)'
 			}
 		}
-		bendel,liszt: {
-			@ferm::rule { 'smtp':
-				domain          => '(ip ip6)',
-				description     => 'Allow smtp access',
-				rule            => '&SERVICE(tcp, 25)'
-			}
-		}
 		draghi: {
 			#@ferm::rule { 'dsa-bind':
 			#    domain          => '(ip ip6)',
@@ -121,12 +110,9 @@ class ferm::per-host {
 			}
 		}
 		cilea: {
-			file {
-				'/etc/ferm/conf.d/load_sip_conntrack.conf':
-					source => 'puppet:///modules/ferm/conntrack_sip.conf',
-					require => Package['ferm'],
-					notify  => Service['ferm'],
-			}
+			ferm::module { 'nf_conntrack_sip': }
+			ferm::module { 'nf_conntrack_h323': }
+
 			@ferm::rule { 'dsa-sip':
 				domain          => '(ip ip6)',
 				description     => 'Allow sip access',