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

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 862d2d77e..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)',