X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=13980a162f607a89293b07dcc7d432be80dc4c82;hb=c7faac1a292cbf1ba1ca086c1ffe6f1187fe72c0;hp=b33ace6a412cfb9f168e359b79bd608403492e54;hpb=a27808992f6b4204c11804f150d07fc0f1246aa9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index b33ace6a4..13980a162 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,saens,schein,santoro,steffani,valente,villa,wieck,bizet] {
-		include ferm::ftp
-	}
-
 	case $::hostname {
 		piatti,samosa: {
 			@ferm::rule { 'dsa-udd-stunnel':
@@ -44,17 +40,6 @@ class ferm::per-host {
 				rule            => '&SERVICE(udp, 69)'
 			}
 		}
-		handel: {
-			@ferm::rule { 'dsa-puppet':
-				description     => 'Allow puppet access',
-				rule            => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN_V4)'
-			}
-			@ferm::rule { 'dsa-puppet-v6':
-				domain          => 'ip6',
-				description     => 'Allow puppet access',
-				rule            => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN_V6)'
-			}
-		}
 		powell: {
 			@ferm::rule { 'dsa-powell-v6-tunnel':
 				description     => 'Allow powell to use V6 tunnel broker',
@@ -66,7 +51,7 @@ class ferm::per-host {
 				rule            => 'proto tcp dport 8000:8100 jump ACCEPT'
 			}
 		}
-		heininen,lotti: {
+		lotti,lully: {
 			@ferm::rule { 'dsa-syslog':
 				description     => 'Allow syslog access',
 				rule            => '&SERVICE_RANGE(tcp, 5140, $HOST_DEBIAN_V4)'