X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=829d71aae82b9fe55da53dc79bede6e3176df92f;hb=dcd05444f7179ed841fdb1cc786b6c1931724cbd;hp=f23946b01b7f3c75b14c2ec71b1345de2a1d9d8c;hpb=2cdec8fac4eb9511d0e7d1a01523066cbd9d13f6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index f23946b01..829d71aae 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -40,40 +40,6 @@ if should_restrict then
 		ssh4allowed << %w{$HOST_DEBIAN_V4}
 		ssh6allowed << %w{$HOST_DEBIAN_V6}
 	end
-
-	if scope.function_has_role(['debian_mirror']) or
-	   scope.function_has_role(['security_mirror']) or
-	   scope.function_has_role(['ports_mirror']) or
-	   scope.function_has_role(['debug_mirror']) or
-	   scope.function_has_role(['historical_mirror']) or
-	   scope.function_has_role(['syncproxy']) then
-		ssh4allowed << '$HOST_MIRRORMASTER_V4'
-		ssh6allowed << '$HOST_MIRRORMASTER_V6'
-	end
-	if scope.function_has_role(['debian_mirror']) or
-	   scope.function_has_role(['syncproxy']) then
-		ssh4allowed << '$HOST_SYNCPROXY_V4'
-		ssh6allowed << '$HOST_SYNCPROXY_V6'
-	end
-	if scope.function_has_role(['security_mirror']) or
-	   scope.function_has_role(['syncproxy']) then
-		ssh4allowed << '$HOST_SECMASTER_V4'
-		ssh6allowed << '$HOST_SECMASTER_V6'
-	end
-	if scope.function_has_role(['historical_mirror']) then
-		ssh4allowed << '$HOST_ARCHIVEMASTER_V4'
-		ssh6allowed << '$HOST_ARCHIVEMASTER_V6'
-	end
-	if scope.function_has_role(['syncproxy']) then
-		ssh4allowed << '$HOST_FTPMASTER_V4'
-		ssh6allowed << '$HOST_FTPMASTER_V6'
-		ssh4allowed << '$HOST_PORTSMASTER_V4'
-		ssh6allowed << '$HOST_PORTSMASTER_V6'
-	end
-	if scope.function_has_role(['debug_mirror']) then
-		ssh4allowed << '$HOST_FTPMASTER_V4'
-		ssh6allowed << '$HOST_FTPMASTER_V6'
-	end
 end
 ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
 ssh6allowed.length == 0 and ssh6allowed << '::/0'