X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=6bd95df6b13bd5003a085339050de27e3f69fc2d;hb=a4f1af760e5f48eace1070239af4c01b1676e0b1;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..6bd95df6b 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -41,15 +41,6 @@ if should_restrict then
 		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'