X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=a1754e8e5618127fcdb8d7fd705d81a76d9c42a4;hb=44ca89ff8860b3b34fa65541a99fcfe72c732f9e;hp=1bf1279ad3b9665854925e3368b12cb330493f20;hpb=ed86c64f1ea3a523b560eb698a66cb1969c84a0c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 1bf1279ad..a1754e8e5 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -44,16 +44,6 @@ if restrict_ssh.include?(@hostname) then
 		ssh4allowed << %w{$HOST_DEBIAN_V4}
 		ssh6allowed << %w{$HOST_DEBIAN_V6}
 	end
-	if scope.function_has_role(['puppetmaster']) then
-		ssh4allowed << "5.153.231.5" # adayevskaya
-		ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
-	end
-	if scope.function_has_role(['dns_primary']) then
-		ssh4allowed << "5.153.231.5" # adayevskaya
-		ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
-		#ssh4allowed << "$HOST_DNS_GEO_V4"
-		#ssh6allowed << "$HOST_DNS_GEO_V6"
-	end
 
 	if scope.function_has_role(['static_master']) then
 		ssh4allowed << '$HOST_STATIC_V4'